diff --git a/mqtt-client-java1.4-uber/pom.xml b/mqtt-client-java1.4-uber/pom.xml
index e2388e1..6582d83 100644
--- a/mqtt-client-java1.4-uber/pom.xml
+++ b/mqtt-client-java1.4-uber/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>org.fusesource.mqtt-client</groupId>
     <artifactId>mqtt-client-project</artifactId>
-    <version>1.15-SNAPSHOT</version>
+    <version>1.14.sofia</version>
   </parent>
   
   
   <groupId>org.fusesource.mqtt-client</groupId>
   <artifactId>mqtt-client-java1.4-uber</artifactId>
-  <version>1.15-SNAPSHOT</version>
+  <version>1.14.sofia</version>
   
   <name>${project.artifactId}</name>
   <description>
diff --git a/mqtt-client-website/pom.xml b/mqtt-client-website/pom.xml
index 7588118..ba399f6 100644
--- a/mqtt-client-website/pom.xml
+++ b/mqtt-client-website/pom.xml
@@ -26,12 +26,12 @@
   <parent>
     <groupId>org.fusesource.mqtt-client</groupId>
     <artifactId>mqtt-client-project</artifactId>
-    <version>1.15-SNAPSHOT</version>
+    <version>1.14.sofia</version>
   </parent>
   
   <groupId>org.fusesource.mqtt-client</groupId>
   <artifactId>mqtt-client-website</artifactId>
-  <version>1.15-SNAPSHOT</version>
+  <version>1.14.sofia</version>
   <packaging>war</packaging>
 
   <name>${project.artifactId}</name>
diff --git a/mqtt-client/pom.xml b/mqtt-client/pom.xml
index b6f7d80..b93a47a 100755
--- a/mqtt-client/pom.xml
+++ b/mqtt-client/pom.xml
@@ -25,12 +25,12 @@
   <parent>
     <groupId>org.fusesource.mqtt-client</groupId>
     <artifactId>mqtt-client-project</artifactId>
-    <version>1.15-SNAPSHOT</version>
+    <version>1.14.sofia</version>
   </parent>
   
   <groupId>org.fusesource.mqtt-client</groupId>
   <artifactId>mqtt-client</artifactId>
-  <version>1.15-SNAPSHOT</version>
+  <version>1.14.sofia</version>
   <packaging>bundle</packaging>
   
   <name>${project.artifactId}</name>
diff --git a/mqtt-client/src/main/java/org/fusesource/mqtt/client/CallbackConnection.java b/mqtt-client/src/main/java/org/fusesource/mqtt/client/CallbackConnection.java
index 9aadb95..e2267ac 100644
--- a/mqtt-client/src/main/java/org/fusesource/mqtt/client/CallbackConnection.java
+++ b/mqtt-client/src/main/java/org/fusesource/mqtt/client/CallbackConnection.java
@@ -1,5 +1,6 @@
 /**
  * Copyright (C) 2010-2012, FuseSource Corp.  All rights reserved.
+ * Copyright (C) 2016, Indra Sistemas S.A. All rights reserved
  *
  *     http://fusesource.com
  *
@@ -634,15 +635,20 @@ public void kill(final Callback<Void> onComplete) {
             heartBeatMonitor.stop();
             heartBeatMonitor = null;
         }
-        transport.stop(new Task() {
-            @Override
-            public void run() {
-                listener.onDisconnected();
-                if (onComplete != null) {
-                    onComplete.onSuccess(null);
-                }
-            }
-        });
+        /*
+         * Fix: in some scenarios, a NullPointerException was raised when the connection was killed.
+         */
+        if (transport!=null) {
+	        transport.stop(new Task() {
+	            @Override
+	            public void run() {
+	                listener.onDisconnected();
+	                if (onComplete != null) {
+	                    onComplete.onSuccess(null);
+	                }
+	            }
+	        });
+        }
     }
 
     public void publish(String topic, byte[] payload, QoS qos, boolean retain, Callback<Void> cb) {
diff --git a/pom.xml b/pom.xml
index 3aae50e..cd79cea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
 
   <groupId>org.fusesource.mqtt-client</groupId>
   <artifactId>mqtt-client-project</artifactId>
-  <version>1.15-SNAPSHOT</version>
+  <version>1.14.sofia</version>
   <packaging>pom</packaging>
 
   <name>${project.artifactId}</name>