2 files changed, 11 insertions, 2 deletions

diff --git a/backend/php/src/index.php b/backend/php/src/index.php
index eb3d75a..58c10a9 100644
--- a/backend/php/src/index.php
+++ b/backend/php/src/index.php
@@ -721,8 +721,11 @@ error_log("message");
                                 }
                                 
                                 //=============================================================
-                        } else {
+                        } else if (isset($_SESSION['K'])) {
                                 $result["error"] = "Wrong shared secret!";
+                        } else {
+                                $result["result"] = "EXCEPTION";
+                                $result["message"] = "Trying to communicate without an active connection";
                         }
                         break;
 
@@ -741,4 +744,4 @@ error_log("default");
         
         echo(json_encode($result));
 error_log("result: ".json_encode($result));
-?>
\ No newline at end of file
+?>
diff --git a/frontend/beta/js/Clipperz/PM/Proxy/Proxy.PHP.js b/frontend/beta/js/Clipperz/PM/Proxy/Proxy.PHP.js
index e7c2bc1..6185fd6 100755
--- a/frontend/beta/js/Clipperz/PM/Proxy/Proxy.PHP.js
+++ b/frontend/beta/js/Clipperz/PM/Proxy/Proxy.PHP.js
@@ -238,6 +238,12 @@ YAHOO.extendX(Clipperz.PM.Proxy.PHP, Clipperz.PM.Proxy, {
 //deferredResult.addCallback(function(res) {MochiKit.Logging.logDebug("Proxy.PHP.response - 2: " + res.responseText); return res;});
 //deferredResult.addErrback(function(res) {MochiKit.Logging.logDebug("Proxy.PHP.response - ERROR: " + res); return res;});
                 deferredResult.addCallback(MochiKit.Async.evalJSONRequest);
+                deferredResult.addCallback(function (someValues) {
+                        if (someValues['result'] == 'EXCEPTION') {
+                                throw someValues['message'];
+                        }
+                        return someValues;
+                })
                 deferredResult.callback();
 
                 return deferredResult;