Less aggressive error handling (was interfering with authentication)