diff --git a/solvebio/resource/dataset.py b/solvebio/resource/dataset.py
index 18482364..51998df3 100644
--- a/solvebio/resource/dataset.py
+++ b/solvebio/resource/dataset.py
@@ -72,7 +72,11 @@ def get_or_create_by_full_path(cls, full_path, **kwargs):
         kwargs['assert_type'] = 'dataset'
         # Create this is a dataset (for the "create" in get_or_create)
         kwargs['object_type'] = 'dataset'
-        obj = Object.get_or_create_by_full_path(full_path, **kwargs)
+
+        _client = kwargs.pop('client', None) or cls._client or client
+        obj = Object.get_or_create_by_full_path(
+            full_path, client=_client, **kwargs)
+
         return cls.retrieve(obj.dataset_id)
 
     def saved_queries(self, **params):
diff --git a/tox.ini b/tox.ini
index b0d5d317..f7beda1e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,6 +11,7 @@ filename = *.py
 ; proper indentation would make it line up with the next ident which is
 ; E125
 ignore = E127,E402,N801,N802,E722,W504
+max-line-length = 120
 
 [tox]
 envlist = py27, py34, py37, pypy