From fc4a71aa5c773dca1b5cb786d80e692149f5d271 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 10 Jun 2012 16:47:27 -0400
Subject: [PATCH] Bug #1001

- Fixed bug #1001, which caused a segv (thanks to Bryce Harrington).
---
 ChangeLog       | 1 +
 src/Context.cpp | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 426f5d0d6..083cd28fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -76,6 +76,7 @@ Bugs
    characters were used in a description (thanks to Hyde Stevenson).
  + Fixed bug #990, which prevents color precedence to be applied correctly for
    tagged tasks.
+ + Fixed bug #1001, which caused a segv (thanks to Bryce Harrington).
  + Fixed bug #1008, which failed to remove tasks with the special tag '+nocal'
    from the calendar report output with 'calendar.details=full' set (thanks to
    Bryan Kam).
diff --git a/src/Context.cpp b/src/Context.cpp
index 6ca3dfb16..dc1569379 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -396,7 +396,10 @@ int Context::dispatch (std::string &out)
     return rc;
   }
 
-  return commands["help"]->execute (out);
+  if (commands["help"])
+    return commands["help"]->execute (out);
+
+  return 1;
 }
 
 ////////////////////////////////////////////////////////////////////////////////