diff --git a/index.html b/index.html
index c99e115..67e4b34 100644
--- a/index.html
+++ b/index.html
@@ -42,6 +42,9 @@
         <div class="alert alert-danger" ng-show="errorMessage">
           <strong>Connection error</strong> The client was unable to connect to the WeeChat relay
         </div>
+        <div class="alert alert-danger" ng-show="sslError">
+          <strong>Secure connection error</strong> A secure connection with the WeeChat relay could not be initiated. This is most likely because your browser does not trust your relay's certificate. Please read the encryption instructions below!
+        </div>
         <div class="panel-group" id="accordion">
           <div class="panel">
             <div class="panel-heading">
diff --git a/js/glowingbear.js b/js/glowingbear.js
index a8c8f94..e8cd22b 100644
--- a/js/glowingbear.js
+++ b/js/glowingbear.js
@@ -337,14 +337,22 @@ function($rootScope,
         };
 
 
-        var onclose = function () {
+        var onclose = function (evt) {
             /*
              * Handles websocket disconnection
              */
             $log.info("Disconnected from relay");
             failCallbacks('disconnection');
             $rootScope.connected = false;
-            $rootScope.$emit('relayDisconnect');
+            if ($rootScope.waseverconnected) {
+                $rootScope.$emit('relayDisconnect');
+            } else if (ssl && evt.code === 1006) {
+                // A password error doesn't trigger onerror, but certificate issues do. Check time of last error.
+                if (typeof $rootScope.lastError !== "undefined" && (Date.now() - $rootScope.lastError) < 1000) {
+                    // abnormal disconnect by client, most likely ssl error
+                    $rootScope.sslError = true;
+                }
+            }
             $rootScope.$apply();
         };
 
@@ -353,7 +361,8 @@ function($rootScope,
              * Handles cases when connection issues come from
              * the relay.
              */
-            $log.error("Relay error" + evt.data);
+            $log.error("Relay error", evt);
+            $rootScope.lastError = Date.now();
 
             if (evt.type === "error" && this.readyState !== 1) {
                 failCallbacks('error');
@@ -946,6 +955,8 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
 
     $scope.connect = function() {
         $scope.requestNotificationPermission();
+        $rootScope.sslError = false;
+        $rootScope.errorMessage = false;
         connection.connect($scope.host, $scope.port, $scope.password, $scope.ssl);
     };
     $scope.disconnect = function() {