diff --git a/src/dcd/client/client.d b/src/dcd/client/client.d
index 18a4207..714f6f3 100644
--- a/src/dcd/client/client.d
+++ b/src/dcd/client/client.d
@@ -35,6 +35,21 @@ import dcd.common.dcd_version;
 import dcd.common.socket;
 
 int main(string[] args)
+{
+	try
+	{
+		return runClient(args);
+	}
+	catch (Exception e)
+	{
+		stderr.writeln(e);
+		return 1;
+	}
+}
+
+private:
+
+int runClient(string[] args)
 {
 	sharedLog.fatalHandler = () {};
 
@@ -243,8 +258,6 @@ int main(string[] args)
 	return 0;
 }
 
-private:
-
 void printHelp(string programName)
 {
 	writefln(