diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,8 @@
 #Change Log
+##0.6.0.2
+* Added support for aeson > 0.8 and network > 2.6
+* Added support for the "X-Response-Body-Start" HTTP header used for error responses in newer http-client versions
+
 ##0.6
 * Rather than WDSession serving dual roles as configuration and state, its functionality has been split into 2 respective types: WDConfig and WDSession.
 * runSession now takes a WDConfig instead of WDSession and Capabilities parameters.
diff --git a/src/Test/WebDriver/Commands.hs b/src/Test/WebDriver/Commands.hs
--- a/src/Test/WebDriver/Commands.hs
+++ b/src/Test/WebDriver/Commands.hs
@@ -134,7 +134,7 @@
                   putSession s { wdSessId = Nothing }
 
 
--- |Sets the amount of time we implicitly wait when searching for elements.
+-- |Sets the amount of time (ms) we implicitly wait when searching for elements.
 setImplicitWait :: WebDriver wd => Integer -> wd ()
 setImplicitWait ms =
   noReturn $ doSessCommand methodPost "/timeouts/implicit_wait" (object msField)
@@ -143,7 +143,7 @@
   where msField   = ["ms" .= ms]
         allFields = ["type" .= ("implicit" :: String)] ++ msField
 
--- |Sets the amount of time we wait for an asynchronous script to return a
+-- |Sets the amount of time (ms) we wait for an asynchronous script to return a
 -- result.
 setScriptTimeout :: WebDriver wd => Integer -> wd ()
 setScriptTimeout ms =
@@ -153,7 +153,7 @@
   where msField   = ["ms" .= ms]
         allFields = ["type" .= ("script" :: String)] ++ msField
 
--- |Sets the amount of time to wait for a page to finish loading before throwing a 'Timeout' exception
+-- |Sets the amount of time (ms) to wait for a page to finish loading before throwing a 'Timeout' exception.
 setPageLoadTimeout :: WebDriver wd => Integer -> wd ()
 setPageLoadTimeout ms = noReturn $ doSessCommand methodPost "/timeouts" params
   where params = object ["type" .= ("page load" :: String)
diff --git a/src/Test/WebDriver/Firefox/Profile.hs b/src/Test/WebDriver/Firefox/Profile.hs
--- a/src/Test/WebDriver/Firefox/Profile.hs
+++ b/src/Test/WebDriver/Firefox/Profile.hs
@@ -139,7 +139,11 @@
                          ,"parent.lock", ".parentlock", ".lock"
                          ,userPrefFile])
 
-    getPrefs = HM.fromList <$> (parsePrefs =<< BS.readFile userPrefFile)
+    getPrefs = do
+       prefFileExists <- doesFileExist userPrefFile
+       if prefFileExists
+        then HM.fromList <$> (parsePrefs =<< BS.readFile userPrefFile)
+        else return HM.empty
       where parsePrefs s = either (throwIO . ProfileParseError) return
                            $ parseOnly prefsParser s
 
diff --git a/webdriver.cabal b/webdriver.cabal
--- a/webdriver.cabal
+++ b/webdriver.cabal
@@ -1,5 +1,5 @@
 Name: webdriver
-Version: 0.6.0.2
+Version: 0.6.0.3
 Cabal-Version: >= 1.8
 License: BSD3
 License-File: LICENSE
@@ -35,9 +35,9 @@
   ghc-options: -Wall
   build-depends:   base == 4.*
                  , aeson >= 0.6.2.0 && < 0.9
-                 , http-client >= 0.3 && < 0.4
+                 , http-client >= 0.3 && < 0.5
                  , http-types >= 0.8 && < 0.9
-                 , text >= 0.11.3 && < 1.2.0.0
+                 , text >= 0.11.3 && < 1.3
                  , bytestring >= 0.9 && < 0.11
                  , attoparsec < 0.13
                  , base64-bytestring >= 1.0 && < 1.1