diff --git a/KdeConnect/src/main/java/org/kde/connect/PackageEmitters/PingPackageEmitter.java b/KdeConnect/src/main/java/org/kde/connect/PackageEmitters/PingPackageEmitter.java
index f83fde15..5695bdd3 100644
--- a/KdeConnect/src/main/java/org/kde/connect/PackageEmitters/PingPackageEmitter.java
+++ b/KdeConnect/src/main/java/org/kde/connect/PackageEmitters/PingPackageEmitter.java
@@ -8,10 +8,7 @@ import org.kde.connect.Types.NetworkPackage;
 
 public class PingPackageEmitter extends BasePackageEmitter {
 
-    Context context;
-
     public PingPackageEmitter(Context ctx) {
-        context = ctx;
     }
 
     public void sendPing() {
diff --git a/KdeConnect/src/main/java/org/kde/connect/Types/NetworkPackage.java b/KdeConnect/src/main/java/org/kde/connect/Types/NetworkPackage.java
index 93d984db..db401bb1 100644
--- a/KdeConnect/src/main/java/org/kde/connect/Types/NetworkPackage.java
+++ b/KdeConnect/src/main/java/org/kde/connect/Types/NetworkPackage.java
@@ -13,11 +13,12 @@ import java.util.TimeZone;
 
 public class NetworkPackage {
 
-    private int mVersion = 1;
+    private final static int CURRENT_PACKAGE_VERSION = 1;
 
     private long mId;
     private String mType;
     private JSONObject mBody;
+    private int mVersion;
 
     private NetworkPackage() {
     }
@@ -26,6 +27,7 @@ public class NetworkPackage {
         mId = System.currentTimeMillis();
         mType = type;
         mBody = new JSONObject();
+        mVersion = CURRENT_PACKAGE_VERSION;
     }
 
     public String getType() {
@@ -72,6 +74,9 @@ public class NetworkPackage {
         } catch (Exception e) {
             return null;
         }
+        if (np.mVersion > CURRENT_PACKAGE_VERSION) {
+            Log.e("NetworkPackage.unserialize","Version "+np.mVersion+" greater than supported version "+CURRENT_PACKAGE_VERSION);
+        }
         return np;
     }