diff --git a/core/includes/path.inc b/core/includes/path.inc
index d0c954e..120151e 100644
--- a/core/includes/path.inc
+++ b/core/includes/path.inc
@@ -88,7 +88,10 @@ function current_path() {
   // fallback code below, once the path alias logic has been figured out in
   // http://drupal.org/node/1269742.
   if (drupal_container()->isScopeActive('request')) {
-    return drupal_container()->get('request')->attributes->get('system_path');
+    $path = drupal_container()->get('request')->attributes->get('system_path');
+    if ($path !== NULL) {
+      return $path;
+    }
   }
   // If we are outside the request scope, fall back to using the path stored in
   // _current_path().