diff --git a/Yesod/Handler.hs b/Yesod/Handler.hs
index 9e6f5e14..6a06903c 100644
--- a/Yesod/Handler.hs
+++ b/Yesod/Handler.hs
@@ -23,7 +23,6 @@ module Yesod.Handler
     , getYesod
     , runHandler
     , liftIO
-    --, ToHandler (..)
       -- * Special handlers
     , redirect
     , sendFile
diff --git a/Yesod/Request.hs b/Yesod/Request.hs
index f8843564..a48a3db7 100644
--- a/Yesod/Request.hs
+++ b/Yesod/Request.hs
@@ -22,7 +22,7 @@ module Yesod.Request
       -- * RawRequest
       RawRequest (..)
     , RequestReader (..)
-    , parseEnv
+    , waiRequest
     , cookies
     , getParams
     , postParams
@@ -70,9 +70,9 @@ class RequestReader m where
 languages :: (Functor m, RequestReader m) => m [Language]
 languages = rawLangs `fmap` getRawRequest
 
--- | Get the raw 'W.Env' value.
-parseEnv :: (Functor m, RequestReader m) => m W.Request
-parseEnv = rawRequest `fmap` getRawRequest
+-- | Get the raw 'W.Request' value.
+waiRequest :: (Functor m, RequestReader m) => m W.Request
+waiRequest = rawWaiRequest `fmap` getRawRequest
 
 type RequestBodyContents =
     ( [(ParamName, ParamValue)]
@@ -85,7 +85,7 @@ data RawRequest = RawRequest
     , rawCookies :: [(ParamName, ParamValue)]
     , rawSession :: [(B.ByteString, B.ByteString)]
     , rawRequestBody :: IO RequestBodyContents
-    , rawRequest :: W.Request
+    , rawWaiRequest :: W.Request
     , rawLangs :: [Language]
     }
 
diff --git a/Yesod/Yesod.hs b/Yesod/Yesod.hs
index 1858f030..b5a92e1c 100644
--- a/Yesod/Yesod.hs
+++ b/Yesod/Yesod.hs
@@ -90,8 +90,10 @@ defaultErrorHandler :: Yesod y
                     => ErrorResponse
                     -> Handler y ChooseRep
 defaultErrorHandler NotFound = do
-    --rr <- getRawRequest
-    applyLayout' "Not Found" $ cs $ toHtmlObject [("Not found", "FIXME")]
+    r <- waiRequest
+    applyLayout' "Not Found" $ cs $ toHtmlObject
+        [ ("Not found", cs $ W.pathInfo r :: String)
+        ]
 defaultErrorHandler PermissionDenied =
     applyLayout' "Permission Denied" $ cs "Permission denied"
 defaultErrorHandler (InvalidArgs ia) =