diff --git a/dvc/analytics.py b/dvc/analytics.py
index 2a7ad7c8f..d9805bfd1 100644
--- a/dvc/analytics.py
+++ b/dvc/analytics.py
@@ -96,11 +96,12 @@ class Analytics(object):
         with open(self.user_id_file, "r") as fobj:
             try:
                 info = json.load(fobj)
-                return info[self.PARAM_USER_ID]
-            except json.JSONDecodeError as exc:
+            except ValueError as exc:
                 logger.debug("Failed to load user_id: {}".format(exc))
                 return None
 
+            return info[self.PARAM_USER_ID]
+
     def _get_user_id(self):
         from dvc.lock import LockError
 
diff --git a/dvc/remote/base.py b/dvc/remote/base.py
index 560765589..5522711d3 100644
--- a/dvc/remote/base.py
+++ b/dvc/remote/base.py
@@ -225,7 +225,7 @@ class RemoteBase(object):
         try:
             with open(path, "r") as fobj:
                 d = json.load(fobj)
-        except json.JSONDecodeError:
+        except ValueError:
             logger.exception("Failed to load dir cache '{}'".format(path_info))
             return []
         finally:
diff --git a/dvc/utils/compat.py b/dvc/utils/compat.py
index 0e104a0f4..088c43a1f 100644
--- a/dvc/utils/compat.py
+++ b/dvc/utils/compat.py
@@ -5,7 +5,6 @@ import sys
 import os
 import errno
 
-
 # Syntax sugar.
 _ver = sys.version_info