diff --git a/postgresql-simple-opts.cabal b/postgresql-simple-opts.cabal
--- a/postgresql-simple-opts.cabal
+++ b/postgresql-simple-opts.cabal
@@ -1,5 +1,5 @@
 name:                postgresql-simple-opts
-version:             0.1.0.1
+version:             0.1.0.2
 synopsis:            An optparse-applicative parser for postgresql-simple's connection options
 description:         This package exports a optparse-applicative parser and type for postgresql-simple's ConnectInfo and connection string.
 homepage:            https://github.com/jfischoff/postgresql-simple-opts#readme
diff --git a/src/Database/PostgreSQL/Simple/Options.lhs b/src/Database/PostgreSQL/Simple/Options.lhs
--- a/src/Database/PostgreSQL/Simple/Options.lhs
+++ b/src/Database/PostgreSQL/Simple/Options.lhs
@@ -148,13 +148,16 @@
 `postgresql-simple` provides sensible defaults for `ConnectInfo` via `defaultConnectInfo`. We use these as the defaults when parsing. We create a `PartialConnectInfo` with these defaults.
 
 ```haskell
+mkLast :: a -> Last a
+mkLast = Last . Just
+
 defaultPartialConnectInfo :: PartialConnectInfo
 defaultPartialConnectInfo = PartialConnectInfo
-  { host     = return $                connectHost     defaultConnectInfo
-  , port     = return $ fromIntegral $ connectPort     defaultConnectInfo
-  , user     = return $                connectUser     defaultConnectInfo
-  , password = return $                connectPassword defaultConnectInfo
-  , database = return $                connectDatabase defaultConnectInfo
+  { host     = mkLast $                connectHost     defaultConnectInfo
+  , port     = mkLast $ fromIntegral $ connectPort     defaultConnectInfo
+  , user     = mkLast $                connectUser     defaultConnectInfo
+  , password = mkLast $                connectPassword defaultConnectInfo
+  , database = mkLast $                connectDatabase defaultConnectInfo
   }
 ```