diff --git a/source/UI/js/Map/MapEditor.js b/source/UI/js/Map/MapEditor.js
index 1b358d7f..64b36988 100644
--- a/source/UI/js/Map/MapEditor.js
+++ b/source/UI/js/Map/MapEditor.js
@@ -1041,7 +1041,7 @@ Ox.MapEditor = function(options, self) {
         var isResult = place && place.id[0] == '_',
             isUndefined = !!self.options.selected
                 && !self.$list.value(self.options.selected, 'type');
-        self.selectedPlace = place.id || '';
+        self.selectedPlace = place && place.id ? place.id : '';
         if (isResult && isUndefined) {
             Ox.print('place.id', place.id, 'self.options.selected', self.options.selected, 'type', self.$list.value(self.options.selected));
             // define undefined place
diff --git a/source/UI/js/Video/VideoPlayer.js b/source/UI/js/Video/VideoPlayer.js
index 8df95916..9a15bcf4 100644
--- a/source/UI/js/Video/VideoPlayer.js
+++ b/source/UI/js/Video/VideoPlayer.js
@@ -1794,20 +1794,22 @@ Ox.VideoPlayer = function(options, self) {
     function goToNext(type, direction) {
         // type can be 'chapter' or 'result'
         var position, positions;
-        if (type == 'chapter') {
+        if (type == 'chapter' && self.options.chapters) {
             positions = self.options.chapters.map(function(chapter) {
                 return chapter.position;
             });
-        } else if (type == 'result') {
+        } else if (type == 'result' && self.results) {
             positions = Ox.unique(self.results.map(function(result) {
                 return result['in'];
             }));
         }
-        position = Ox.nextValue(positions, self.options.position, direction);
-        setPosition(position);
-        that.triggerEvent('position', {
-            position: self.options.position
-        });
+        if (positions) {
+            position = Ox.nextValue(positions, self.options.position, direction);
+            setPosition(position);
+            that.triggerEvent('position', {
+                position: self.options.position
+            });
+        }
     }
 
     function goToPoint() {
diff --git a/source/UI/js/Video/VideoPlayerPanel.js b/source/UI/js/Video/VideoPlayerPanel.js
index a1908bcb..336277e4 100644
--- a/source/UI/js/Video/VideoPlayerPanel.js
+++ b/source/UI/js/Video/VideoPlayerPanel.js
@@ -478,7 +478,7 @@ Ox.VideoPlayerPanel = function(options, self) {
     }
 
     function getAnnotations() {
-        return Ox.flatten(self.options.layers.map(function(layer) {
+        return !self.options.layers ? [] : Ox.flatten(self.options.layers.map(function(layer) {
             return layer.items.map(function(item) {
                 return {id: item.id, 'in': item['in'], out: item.out, text: item.value};
             });