diff --git a/jwplatform/client.py b/jwplatform/client.py
index 18edad5..f00b7e1 100644
--- a/jwplatform/client.py
+++ b/jwplatform/client.py
@@ -61,11 +61,11 @@ class Client(object):
         self.__key = key
         self.__secret = secret
 
-        self._scheme = kwargs.pop('scheme', 'https')
-        self._host = kwargs.pop('host', 'api.jwplatform.com')
-        self._port = int(kwargs.pop('port', 80))
-        self._api_version = kwargs.pop('version', 'v1')
-        self._agent = kwargs.pop('agent', None)
+        self._scheme = kwargs.get('scheme') or 'https'
+        self._host = kwargs.get('host') or 'api.jwplatform.com'
+        self._port = int(kwargs['port']) if kwargs.get('port') else 80
+        self._api_version = kwargs.get('version') or 'v1'
+        self._agent = kwargs.get('agent')
 
         self._connection = requests.Session()
         self._connection.mount(self._scheme, RetryAdapter())

diff --git a/tests/test_init.py b/tests/test_init.py
index dc3ab77..3502914 100644
--- a/tests/test_init.py
+++ b/tests/test_init.py
@@ -50,3 +50,33 @@ def test_custom_initialization():
     assert 'User-Agent' in jwp_client._connection.headers
     assert jwp_client._connection.headers['User-Agent'] == \
         'python-jwplatform/{}-{}'.format(jwplatform.__version__, AGENT)
+
+
+def test_custom_initialization_empty_kwargs():
+
+    KEY = 'api_key'
+    SECRET = 'api_secret'
+    SCHEME = None
+    HOST = None
+    PORT = None
+    API_VERSION = None
+    AGENT = None
+
+    jwp_client = jwplatform.Client(
+        KEY, SECRET,
+        scheme=SCHEME,
+        host=HOST,
+        port=PORT,
+        version=API_VERSION,
+        agent=AGENT)
+
+    assert jwp_client._Client__key == KEY
+    assert jwp_client._Client__secret == SECRET
+    assert jwp_client._scheme == 'https'
+    assert jwp_client._host == 'api.jwplatform.com'
+    assert jwp_client._port == 80
+    assert jwp_client._api_version == 'v1'
+    assert jwp_client._agent is None
+    assert 'User-Agent' in jwp_client._connection.headers
+    assert jwp_client._connection.headers['User-Agent'] == \
+        'python-jwplatform/{}'.format(jwplatform.__version__)

Client with null kwargs does not use default parameters
Currently jwplatform.Client instantiation only uses default parameters if a kwarg doesn't exist. If the kwarg is `None` this value is still used. It would be expected that `None` values for a kwarg use the default value.

**Current**
```python
>>> import jwplatform
>>> client = jwplatform.Client('key', 'secret', host=None)
>>> client._host == 'api.jwplatform.com'
False
```

**Expected**
```python
>>> import jwplatform
>>> client = jwplatform.Client('key', 'secret', host=None)
>>> client._host == 'api.jwplatform.com'
True
```

tests/test_init.py::test_custom_initialization_empty_kwargs
tests/test_init.py::test_default_initialization tests/test_init.py::test_custom_initialization