diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
index df5ebedbd2..5384f537c8 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
@@ -280,7 +280,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			}
 			
 			private function showNotification():void {
-				if (parent.visible) {
+				if (parent && parent.visible) {
 					visible = includeInLayout = true;
 					
 					if (notificationTimer.running) notificationTimer.reset();
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
index 3374654308..4605bfc916 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
@@ -444,13 +444,15 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			}
 			
 			private function goToPreviousSlide():void {
-				if (PresentationModel.getInstance().getCurrentPage().num > 1) {
+				var curPage:Page = PresentationModel.getInstance().getCurrentPage();
+				if (curPage != null && curPage.num > 1) {
 					dispatchEvent(new GoToPrevPageCommand());
 				}
 			}
 			
 			private function goToNextSlide():void {
-				if (PresentationModel.getInstance().getCurrentPage().num < PresentationModel.getInstance().getNumberOfPages()) {
+				var curPage:Page = PresentationModel.getInstance().getCurrentPage();
+				if (curPage != null && curPage.num < PresentationModel.getInstance().getNumberOfPages()) {
 					dispatchEvent(new GoToNextPageCommand());
 				}
 			}
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
index 0fd6335736..5cf3e6c736 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
@@ -60,7 +60,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			import org.bigbluebutton.modules.present.events.DisplaySlideEvent;
 			import org.bigbluebutton.modules.present.events.PageChangedEvent;
 			import org.bigbluebutton.modules.present.events.PageLoadedEvent;
-			import org.bigbluebutton.modules.present.events.PresenterCommands;
 			import org.bigbluebutton.modules.present.model.Page;
 			import org.bigbluebutton.modules.present.model.PagePositionBroadcaster;
 			import org.bigbluebutton.modules.present.model.Presentation;
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/maps/SharedNotesEventMapDelegate.as b/bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/maps/SharedNotesEventMapDelegate.as
index 6b4791bf60..9dfa251a00 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/maps/SharedNotesEventMapDelegate.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/maps/SharedNotesEventMapDelegate.as
@@ -57,7 +57,7 @@ package org.bigbluebutton.modules.sharednotes.maps
 				LOGGER.debug("NoteId:" + id +":"+e.document[id] + ":" + e.type);
 				if (id != window.noteId && !windows.hasOwnProperty(id)) {
 					createAdditionalNotes(id, "");
-					windows[id].addRemoteDocument(e.document, e.isNotesLimit);
+					SharedNotesWindow(windows[id]).addRemoteDocument(e.document, e.isNotesLimit);
 				}
 			}
 
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserGraphicHolder.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserGraphicHolder.mxml
index 4a5d53cf55..6280c61df0 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserGraphicHolder.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserGraphicHolder.mxml
@@ -44,6 +44,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 			
 			import mx.core.UIComponent;
 			
+			import org.as3commons.lang.StringUtils;
 			import org.as3commons.logging.api.ILogger;
 			import org.as3commons.logging.api.getClassLogger;
 			import org.bigbluebutton.common.Role;
@@ -142,7 +143,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
             public function loadAvatar(options:VideoConfOptions):void {
                 avatar.user = _user;
                 avatar.options = options;
-                avatar.load(UsersUtil.getUserAvatarURL(_user.intId));
+				var userAvatar : String = UsersUtil.getUserAvatarURL(_user.intId);
+				if (!StringUtils.isEmpty(userAvatar)) {
+	                avatar.load(userAvatar);
+				}
 
                 avatarVisibility = true;
                 setUserProperties();