diff --git a/ChangeLog b/ChangeLog
index eff67857..94edb933 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,6 +34,7 @@
           (thanks to Lynoure, asmyers).
 - TI-61   Typo in exclusion.t.cpp
           (thanks to Thomas Lauf).
+- TI-62   TimeWarrior should not ignore invalid command
 - TI-64   Command 'stop' with date before current interval's start date causes segfault
           (thanks to Thomas Lauf).
 - TI-65   The 'tags' command should support a filter
diff --git a/src/init.cpp b/src/init.cpp
index b89fe00b..e282b542 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -297,7 +297,16 @@ int dispatchCommand (
   }
   else
   {
-    status = CmdDefault (rules, database);
+    auto words = cli.getWords ();
+
+    if (words.size () > 0)
+    {
+      throw format ("'{1}' is not a timew command. See 'timew help'.", words[0]);
+    }
+    else
+    {
+      status = CmdDefault (rules, database);
+    }
   }
 
   return status;