Removed Log file, added some better error messages