diff --git a/src/databricks/sql/utils.py b/src/databricks/sql/utils.py
index 2807bd2bb..0575194c9 100644
--- a/src/databricks/sql/utils.py
+++ b/src/databricks/sql/utils.py
@@ -27,6 +27,7 @@
 import logging
 
 BIT_MASKS = [1, 2, 4, 8, 16, 32, 64, 128]
+DEFAULT_ERROR_CONTEXT = "Unknown error"
 
 logger = logging.getLogger(__name__)
 
@@ -357,7 +358,12 @@ def user_friendly_error_message(self, no_retry_reason, attempt, elapsed):
             user_friendly_error_message = "{}: {}".format(
                 user_friendly_error_message, self.error_message
             )
-        return user_friendly_error_message
+        try:
+            error_context = str(self.error)
+        except:
+            error_context = DEFAULT_ERROR_CONTEXT
+
+        return user_friendly_error_message + ". " + error_context
 
 
 # Taken from PyHive