diff --git a/gearbox/main.py b/gearbox/main.py
index bbcce89..f655e10 100644
--- a/gearbox/main.py
+++ b/gearbox/main.py
@@ -15,6 +15,9 @@ def __init__(self):
                                       version='2.3',
                                       command_manager=CommandManager('gearbox.commands'))
 
+    def initialize_app(self, args):
+        sys.path.insert(0, os.getcwd())
+
         try:
             self._load_commands_for_current_dir()
         except pkg_resources.DistributionNotFound as e:
@@ -57,7 +60,7 @@ def _load_commands_for_current_dir(self):
             try:
                 pkg_resources.require(package_name)
             except pkg_resources.DistributionNotFound as e:
-                msg = '%sNot Found%s: %s (did you run python setup.py develop?)'
+                msg = '%sNot Found%s: %s (is it an installed Distribution?)'
                 if str(e) != package_name:
                     raise pkg_resources.DistributionNotFound(msg % (str(e) + ': ', ' for', package_name))
                 else: