Merge connectionError and error - now just called error