diff --git a/dbus.cabal b/dbus.cabal
--- a/dbus.cabal
+++ b/dbus.cabal
@@ -1,6 +1,6 @@
 cabal-version: >=1.8
 name: dbus
-version: 1.2.12
+version: 1.2.13
 license: Apache-2.0
 license-file: license.txt
 maintainer: Andrey Sverdlichenko <blaze@ruddy.ru>
@@ -150,7 +150,7 @@
         network >=3.0.1.0 && <3.2,
         parsec <3.2,
         process <1.7,
-        QuickCheck <2.14,
+        QuickCheck <2.15,
         random <1.2,
         resourcet <1.3,
         tasty <1.3,
diff --git a/lib/DBus/Client.hs b/lib/DBus/Client.hs
--- a/lib/DBus/Client.hs
+++ b/lib/DBus/Client.hs
@@ -400,7 +400,7 @@
 connectSession = do
     env <- getSessionAddress
     case env of
-        Nothing -> throwIO (clientError "connectSession: DBUS_SESSION_BUS_ADDRESS is missing or invalid.")
+        Nothing -> throwIO (clientError "connectSession: DBUS_SESSION_BUS_ADDRESS is invalid.")
         Just addr -> connect addr
 
 -- | Connect to the bus specified in the environment variable
diff --git a/lib/DBus/Internal/Address.hs b/lib/DBus/Internal/Address.hs
--- a/lib/DBus/Internal/Address.hs
+++ b/lib/DBus/Internal/Address.hs
@@ -1,3 +1,4 @@
+{-# Language LambdaCase #-}
 -- Copyright (C) 2009-2012 John Millikin <john@john-millikin.com>
 --
 -- Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,13 +15,12 @@
 
 module DBus.Internal.Address where
 
-import qualified Control.Exception
 import           Data.Char (digitToInt, ord, chr)
-import           Data.Maybe (listToMaybe)
+import           Data.Maybe (listToMaybe, fromMaybe)
 import           Data.List (intercalate)
 import qualified Data.Map
 import           Data.Map (Map)
-import qualified System.Environment
+import           System.Environment (lookupEnv)
 import           Text.Printf (printf)
 
 import           Text.ParserCombinators.Parsec
@@ -141,18 +141,20 @@
 getSystemAddress :: IO (Maybe Address)
 getSystemAddress = do
     let system = "unix:path=/var/run/dbus/system_bus_socket"
-    env <- getenv "DBUS_SYSTEM_BUS_ADDRESS"
-    return (parseAddress (maybe system id env))
+    env <- lookupEnv "DBUS_SYSTEM_BUS_ADDRESS"
+    return (parseAddress (fromMaybe system env))
 
 -- | Returns the first address in the environment variable
 -- @DBUS_SESSION_BUS_ADDRESS@, which must be set.
 --
--- Returns 'Nothing' if @DBUS_SYSTEM_BUS_ADDRESS@ is unset or contains an
--- invalid address.
+-- Returns 'Nothing' if @DBUS_SYSTEM_BUS_ADDRESS@ contains an invalid address
+-- or @DBUS_SYSTEM_BUS_ADDRESS@ is unset @XDG_RUNTIME_DIR@ doesn't have @/bus@.
 getSessionAddress :: IO (Maybe Address)
-getSessionAddress = do
-    env <- getenv "DBUS_SESSION_BUS_ADDRESS"
-    return (env >>= parseAddresses >>= listToMaybe)
+getSessionAddress = lookupEnv "DBUS_SESSION_BUS_ADDRESS" >>= \case
+    Just addrs -> pure (parseAddresses addrs >>= listToMaybe)
+    Nothing -> (>>= parseFallback) <$> lookupEnv "XDG_RUNTIME_DIR"
+  where
+    parseFallback dir = parseAddress ("unix:path=" ++ dir ++ "/bus")
 
 -- | Returns the address in the environment variable
 -- @DBUS_STARTER_ADDRESS@, which must be set.
@@ -161,13 +163,8 @@
 -- invalid address.
 getStarterAddress :: IO (Maybe Address)
 getStarterAddress = do
-    env <- getenv "DBUS_STARTER_ADDRESS"
+    env <- lookupEnv "DBUS_STARTER_ADDRESS"
     return (env >>= parseAddress)
-
-getenv :: String -> IO (Maybe String)
-getenv name = Control.Exception.catch
-    (fmap Just (System.Environment.getEnv name))
-    (\(Control.Exception.SomeException _) -> return Nothing)
 
 hexToInt :: String -> Int
 hexToInt = foldl ((+) . (16 *)) 0 . map digitToInt
diff --git a/tests/DBusTests/Client.hs b/tests/DBusTests/Client.hs
--- a/tests/DBusTests/Client.hs
+++ b/tests/DBusTests/Client.hs
@@ -102,9 +102,8 @@
 test_ConnectSession_NoAddress :: TestTree
 test_ConnectSession_NoAddress = testCase "connectSession-no-address" $
     assertException
-        (DBus.Client.clientError "connectSession: DBUS_SESSION_BUS_ADDRESS is missing or invalid.")
-        (withEnv "DBUS_SESSION_BUS_ADDRESS"
-            (Just "invalid")
+        (DBus.Client.clientError "connectSession: DBUS_SESSION_BUS_ADDRESS is invalid.")
+        (withEnv "DBUS_SESSION_BUS_ADDRESS" (Just "invalid")
             DBus.Client.connectSession)
 
 test_ConnectStarter :: TestTree