- Fix issue https://code.google.com/p/bigbluebutton/issues/detail?id=1653

bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml

@@ -72,7 +72,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			import org.bigbluebutton.modules.present.managers.Slide;
 			import org.bigbluebutton.modules.present.ui.views.models.SlideCalcUtil;
 			import org.bigbluebutton.modules.present.ui.views.models.SlideViewModel;
-            import org.bigbluebutton.util.i18n.ResourceUtil;
+			import org.bigbluebutton.util.i18n.ResourceUtil;
             
 			[Bindable] public var zoomPercentage:Number = 100;
 			public static const ZOOM_STEP:int = 5;
@@ -94,7 +94,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			private var whiteboardCanvasHolder:Canvas = new Canvas();
 			private var whiteboardCanvas:IBbbCanvas;
 							
-        	[Bindable] public var slides:ArrayCollection;
+      [Bindable] public var slides:ArrayCollection = new ArrayCollection();
 			[Bindable] public var selectedSlide:int=0;
 			[Bindable] private var lateComerSynched:Boolean = false;
 			

bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/models/Presentation.as

@@ -41,7 +41,11 @@ package org.bigbluebutton.modules.whiteboard.models
         }
         
         public function getAnnotation(id:String):Annotation {
+          if (_currentPage != null) {
             return _currentPage.getAnnotation(id);
+          }
+          
+          return null;
         }
         
 		private function createPages(numPages:int):void {