--- a/core/certmanager.lua	Thu Nov 20 15:00:52 2014 +0100
+++ b/core/certmanager.lua	Sat Nov 22 11:51:54 2014 +0100
@@ -137,10 +137,8 @@
 		else
 			log("error", "SSL/TLS: Error initialising for %s: %s", host, err);
 		end
-	else
-		err = nil;
 	end
-	return ctx, err or user_ssl_config;
+	return ctx, err, user_ssl_config;
 end
 
 function reload_ssl_config()