Removed log and improved error message