diff --git a/src/main/java/com/b44t/messenger/DcMsg.java b/src/main/java/com/b44t/messenger/DcMsg.java
index dc915cc76..591399bfb 100644
--- a/src/main/java/com/b44t/messenger/DcMsg.java
+++ b/src/main/java/com/b44t/messenger/DcMsg.java
@@ -143,11 +143,12 @@ public class DcMsg {
     public native byte[]  getWebxdcBlob      (String filename);
     public JSONObject     getWebxdcInfo      () {
       try {
-        return new JSONObject(getWebxdcInfoJson());
+        String json = getWebxdcInfoJson();
+        if (json != null && !json.isEmpty()) return new JSONObject(json);
       } catch(Exception e) {
         e.printStackTrace();
-        return new JSONObject();
       }
+      return new JSONObject();
     }
     public native String  getWebxdcHref      ();
     public native boolean isForwarded        ();