diff --git a/lib/util/sfContext.class.php b/lib/util/sfContext.class.php
index a0b9f5f75..41b540895 100644
--- a/lib/util/sfContext.class.php
+++ b/lib/util/sfContext.class.php
@@ -235,8 +235,8 @@ public function getEventDispatcher()
     /**
      * Retrieve the action name for this context.
      *
-     * @return string the currently executing action name, if one is set,
-     *                otherwise null
+     * @return string|null the currently executing action name, if one is set,
+     *                     otherwise null
      */
     public function getActionName()
     {
@@ -245,6 +245,8 @@ public function getActionName()
             // @var $lastEntry sfActionStackEntry
             return $lastEntry->getActionName();
         }
+
+        return null;
     }
 
     /**
@@ -341,8 +343,8 @@ public function getDatabaseManager()
     /**
      * Retrieve the module directory for this context.
      *
-     * @return string an absolute filesystem path to the directory of the
-     *                currently executing module, if one is set, otherwise null
+     * @return string|null an absolute filesystem path to the directory of the
+     *                     currently executing module, if one is set, otherwise null
      */
     public function getModuleDirectory()
     {
@@ -351,13 +353,15 @@ public function getModuleDirectory()
             // @var $lastEntry sfActionStackEntry
             return sfConfig::get('sf_app_module_dir').'/'.$lastEntry->getModuleName();
         }
+
+        return null;
     }
 
     /**
      * Retrieve the module name for this context.
      *
-     * @return string the currently executing module name, if one is set,
-     *                otherwise null
+     * @return string|null the currently executing module name, if one is set,
+     *                     otherwise null
      */
     public function getModuleName()
     {
@@ -366,6 +370,8 @@ public function getModuleName()
             // @var $lastEntry sfActionStackEntry
             return $lastEntry->getModuleName();
         }
+
+        return null;
     }
 
     /**