Merge 0.10->trunk

1 files changed, 1 insertions, 1 deletions

diff --git a/prosodyctl b/prosodyctl
index 53399407..79f0a46d 100755
--- a/prosodyctl
+++ b/prosodyctl
@@ -251,7 +251,7 @@ local prosodyctl = require "util.prosodyctl"
 local socket = require "socket"
 
 local http = require "net.http"
-local config_ssl = config.get("*", "ssl")
+local config_ssl = config.get("*", "ssl") or {}
 local https_client = config.get("*", "client_https_ssl")
 http.default.options.sslctx = require "core.certmanager".create_context("client_https port 0", "client",
 	{ capath = config_ssl.capath, cafile = config_ssl.cafile, verify = "peer", }, https_client);