@@ -42,11 +42,10 @@
 	[connection setUsername: @"ObjIRC"];
 	[connection setRealname: @"ObjIRC"];
 	[connection setDelegate: self];
 
 	[connection connect];
-	[connection handleConnection];
 }
 
 - (void)connection: (IRCConnection*)connection
     didReceiveLine: (OFString*)line
 {
@@ -61,10 +60,18 @@
 
 - (void)connectionWasEstablished: (IRCConnection*)connection
 {
 	[connection joinChannel: @"#objfw"];
 }
+
+-	       (void)connection: (IRCConnection *)connection
+  didFailToConnectWithException: (id)exception
+{
+	[of_stderr writeFormat: @"Failed to connect: %@\n", exception];
+
+	[OFApplication terminateWithStatus: 1];
+}
 
 - (void)connection: (IRCConnection*)connection
 	didSeeUser: (IRCUser*)user
        joinChannel: (OFString*)channel
 {