diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index 212c02513f..cb4de0cf7c 100644
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -3189,6 +3189,10 @@ MeterMarkerDrag::motion (GdkEvent* event, bool first_move)
 			const double beat = map.beat_at_bbt (bbt);
 			_real_section = map.add_meter (Meter (_marker->meter().divisions_per_bar(), _marker->meter().note_divisor())
 						       , beat, bbt, map.frame_at_bbt (bbt), _real_section->position_lock_style());
+			if (!_real_section) {
+				aborted (true);
+				return;
+			}
 
 		}
 		/* only snap to bars. leave snap mode alone for audio locked meters.*/
@@ -3329,6 +3333,11 @@ TempoMarkerDrag::motion (GdkEvent* event, bool first_move)
 			} else {
 				_real_section = map.add_tempo (_marker->tempo(), 0.0, frame, _real_section->type(), AudioTime);
 			}
+
+			if (!_real_section) {
+				aborted (true);
+				return;
+			}
 		}
 
 	}