diff --git a/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java b/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java
index 948a94a9f..f89f65e45 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/services/TrackRecordingService.java
@@ -573,6 +573,9 @@ public class TrackRecordingService extends Service {
 
   public long startNewTrack() {
     Log.d(TAG, "TrackRecordingService.startNewTrack");
+    if (isTrackInProgress()) {
+      throw new IllegalStateException("A track is already in progress!");
+    }
 
     long startTime = System.currentTimeMillis();
     acquireWakeLock();
@@ -1008,6 +1011,9 @@ public class TrackRecordingService extends Service {
 
   private void endCurrentTrack() {
     Log.d(TAG, "TrackRecordingService.endCurrentTrack");
+    if (!isTrackInProgress()) {
+      throw new IllegalStateException("No recording track in progress!");
+    }
 
     announcementExecutor.shutdown();
     splitExecutor.shutdown();