diff --git a/clients/flash/air-client/src/org/bigbluebutton/air/whiteboard/views/WhiteboardCanvasMediator.as b/clients/flash/air-client/src/org/bigbluebutton/air/whiteboard/views/WhiteboardCanvasMediator.as
index 0bd03cb088..c85efa3317 100755
--- a/clients/flash/air-client/src/org/bigbluebutton/air/whiteboard/views/WhiteboardCanvasMediator.as
+++ b/clients/flash/air-client/src/org/bigbluebutton/air/whiteboard/views/WhiteboardCanvasMediator.as
@@ -102,6 +102,9 @@ package org.bigbluebutton.air.whiteboard.views {
 		}
 		
 		private function drawAllAnnotations():void {
+			if (_whiteboard == null) {
+				return;
+			}
 			trace("++ draw draw Draw");
 			var annotations:Array = _whiteboard.getAnnotations();
 			for (var i:int = 0; i < annotations.length; i++) {