Cleaned up error handling, less verbose errors to console