1 files changed, 4 insertions, 4 deletions

diff --git a/overlays/worktime/worktime/__main__.py b/overlays/worktime/worktime/__main__.py
index 821d2cdd..21316182 100755
--- a/overlays/worktime/worktime/__main__.py
+++ b/overlays/worktime/worktime/__main__.py
@@ -42,7 +42,7 @@ class TogglAPISection(Enum):
     REPORTS = '/reports/api/v2'
 
 class TogglAPIError(Exception):
-    def __init__(self, http_error, response):
+    def __init__(self, response, *, http_error=None):
         self.http_error = http_error
         self.response = response
 
@@ -179,15 +179,15 @@ class TogglAPI(object):
         url = self._make_url(api = TogglAPISection.TOGGL, section = ['me', 'time_entries', 'current'])
         r = self._query(url = url, method='GET')
 
-        if not r:
-            raise TogglAPIError(None, r)
+        if not r or (not r.json() and r.json() is not None):
+            raise TogglAPIError(r)
 
         if not r.json() or not r.json()['billable']:
             return None
 
         if self._client_ids is not None:
             if 'pid' in r.json() and r.json()['pid']:
-                url = self._make_url(api = TogglAPISection.TOGGL, section = ['workspaces', self._workspace_id, 'projects', str(r.json()['pid'])])
+                url = self._make_url(api = TogglAPISection.TOGGL, section = ['projects', str(r.json()['pid'])])
                 pr = self._query(url = url, method = 'GET')
                 if not pr or not pr.json():
                     raise TogglAPIError(pr)