diff --git a/ptk.nim b/ptk.nim
index cd7b681..2ac7ded 100644
--- a/ptk.nim
+++ b/ptk.nim
@@ -413,7 +413,7 @@ Options:
   let now = getTime().local
 
   # Parse arguments
-  let args = docopt(doc, version = "ptk 0.12.1")
+  let args = docopt(doc, version = "ptk 0.12.2")
 
   if args["--echo-args"]: echo $args
 
@@ -493,6 +493,10 @@ Options:
 
     if args["stop"]:
 
+      if timeline.marks.last.summary == STOP_MSG:
+        echo "no current task, nothing to stop"
+        quit(0)
+
       let newMark: Mark = (
         id: genUUID(),
         time: if args["--time"]: parseTime($args["--time"]) else: now,
diff --git a/ptk.nimble b/ptk.nimble
index eb771b8..b56f3a8 100644
--- a/ptk.nimble
+++ b/ptk.nimble
@@ -1,6 +1,6 @@
 # Package
 
-version       = "0.12.1"
+version       = "0.12.2"
 author        = "Jonathan Bernard"
 description   = "Personal Time Keeper"
 license       = "MIT"