Check if dsn and password values are passed in.

1 files changed, 2 insertions, 2 deletions

diff --git a/pgcli/pgexecute.py b/pgcli/pgexecute.py
index 78e4fae8..3f78989a 100644
--- a/pgcli/pgexecute.py
+++ b/pgcli/pgexecute.py
@@ -233,13 +233,13 @@ class PGExecute(object):
         }
         new_params.update(kwargs)
 
-        if 'dsn' in new_params:
+        if new_params['dsn'] is not None:
             new_params = {
                 'dsn': new_params['dsn'],
                 'password': new_params['password']
             }
 
-            if 'password' in new_params:
+            if new_params['password'] is not None:
                 new_params['dsn'] = "{0} password={1}".format(
                     new_params['dsn'], new_params.pop('password')
                 )