Fix error handling in initial connection.