From c17b1972efe4d7fefb5b88183b335cfb8d5dc970 Mon Sep 17 00:00:00 2001
From: NaikSoftware <naiksav4enko@gmail.com>
Date: Tue, 26 Jun 2018 18:03:49 +0300
Subject: [PATCH] Fix disconnect before connect

---
 .../java/ua/naiksoftware/stomp/client/StompClient.java    | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
index ff4c199..e83a477 100644
--- a/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
+++ b/lib/src/main/java/ua/naiksoftware/stomp/client/StompClient.java
@@ -186,8 +186,12 @@ public void disconnect() {
     }
 
     public Completable disconnectCompletable() {
-        mLifecycleDisposable.dispose();
-        mMessagesDisposable.dispose();
+        if (mLifecycleDisposable != null) {
+            mLifecycleDisposable.dispose();
+        }
+        if (mMessagesDisposable != null) {
+            mMessagesDisposable.dispose();
+        }
         return mConnectionProvider.disconnect()
                 .doOnComplete(() -> setConnected(false));
     }