1 files changed, 3 insertions, 1 deletions
diff --git a/Swift/Controllers/WhiteboardManager.cpp b/Swift/Controllers/WhiteboardManager.cpp
index 50aba6f..d8d89eb 100644
--- a/Swift/Controllers/WhiteboardManager.cpp
+++ b/Swift/Controllers/WhiteboardManager.cpp
@@ -119,18 +119,20 @@ namespace Swift {
 		onSessionTerminate(contact);
 	}
 
 	void WhiteboardManager::handleSessionCancel(const JID& contact) {
 		onSessionTerminate(contact);
 	}
 
 	void WhiteboardManager::handleSessionAccept(const JID& contact) {
 		WhiteboardWindow* window = findWhiteboardWindow(contact);
-		window->show();
+		if (window != NULL) {
+			window->show();
+		}
 		onRequestAccepted(contact);
 	}
 
 	void WhiteboardManager::handleRequestReject(const JID& contact) {
 		onRequestRejected(contact);
 	}
 
 }