Removed warnings, added error logs