diff --git a/org.eclipse.paho.android.service/org.eclipse.paho.android.service/src/org/eclipse/paho/android/service/MqttConnection.java b/org.eclipse.paho.android.service/org.eclipse.paho.android.service/src/org/eclipse/paho/android/service/MqttConnection.java
index 80e20dfa..b84cd73d 100644
--- a/org.eclipse.paho.android.service/org.eclipse.paho.android.service/src/org/eclipse/paho/android/service/MqttConnection.java
+++ b/org.eclipse.paho.android.service/org.eclipse.paho.android.service/src/org/eclipse/paho/android/service/MqttConnection.java
@@ -414,7 +414,7 @@ void disconnect(long quiesceTimeout, String invocationContext,
 			service.callbackToActivity(clientHandle, Status.ERROR, resultBundle);
 		}
 
-		if (connectOptions.isCleanSession()) {
+		if (connectOptions != null && connectOptions.isCleanSession()) {
 			// assume we'll clear the stored messages at this point
 			service.messageStore.clearArrivedMessages(clientHandle);
 		}
@@ -457,7 +457,7 @@ void disconnect(String invocationContext, String activityToken) {
 			service.callbackToActivity(clientHandle, Status.ERROR, resultBundle);
 		}
 
-		if (connectOptions.isCleanSession()) {
+		if (connectOptions != null && connectOptions.isCleanSession()) {
 			// assume we'll clear the stored messages at this point
 			service.messageStore.clearArrivedMessages(clientHandle);
 		}