Added new error message and connection error fallback