diff --git a/README.md b/README.md
index b64a0bc7..27a2c484 100644
--- a/README.md
+++ b/README.md
@@ -78,8 +78,10 @@ try:
     accessToken, tokenType = token_provider()
     print("Access Token:", accessToken)
     print("Type of token:", tokenType)
-except SkyflowError as e:
-    print(e)
+except SkyflowError as skyflow_error:
+    print('Skyflow Error Occurred:', skyflow_error)
+except Exception as general_error:
+    print('Unexpected Error Occurred:', general_error)
 
 ```
 
@@ -114,8 +116,10 @@ try:
     accessToken, tokenType = token_provider()
     print("Access Token:", accessToken)
     print("Type of token:", tokenType)
-except SkyflowError as e:
-    print(e)
+except SkyflowError as skyflow_error:
+    print('Skyflow Error Occurred:', skyflow_error)
+except Exception as general_error:
+    print('Unexpected Error Occurred:', general_error)
 
 ```
 
@@ -183,8 +187,10 @@ try:
     }
     response = client.insert(data, options=options)
     print("Response:", response)
-except SkyflowError as e:
-    print("Error Occurred:", e)
+except SkyflowError as skyflow_error:
+    print('Skyflow Error Occurred:', skyflow_error)
+except Exception as general_error:
+    print('Unexpected Error Occurred:', general_error)
 ```
 
 **Insert call [example](https://github.com/skyflowapi/skyflow-python/blob/main/samples/insert_sample.py)**
@@ -358,6 +364,8 @@ except SkyflowError as e:
         print(e.data) # see note below
     else:
         print(e)
+except Exception as general_error:
+    print('Unexpected Error Occurred:', general_error)
 ```
 
 Sample response:
@@ -408,6 +416,8 @@ except SkyflowError as e:
         print(e.data) # see note below
     else:
         print(e)
+except Exception as general_error:
+    print('Unexpected Error Occurred:', general_error)
 ```
 
 Sample response:
@@ -490,6 +500,8 @@ except SkyflowError as e:
        print(e.data)
    else:
        print(e)
+except Exception as general_error:
+    print('Unexpected Error Occurred:', general_error)
 ```
 
 Sample response:
@@ -551,6 +563,8 @@ except SkyflowError as e:
        print(e.data)
    else:
        print(e)
+except Exception as general_error:
+    print('Unexpected Error Occurred:', general_error)
 ```
 
 Sample response:
@@ -626,6 +640,8 @@ except SkyflowError as e:
         print(e.data) # see note below
     else:
         print(e)
+except Exception as general_error:
+    print('Unexpected Error Occurred:', general_error)
 ```
 
 Sample response:
@@ -713,6 +729,8 @@ except SkyflowError as e:
        print(e.data)
    else:
        print(e)
+except Exception as general_error:
+    print('Unexpected Error Occurred:', general_error)
 ```
 
 Sample response
@@ -804,6 +822,8 @@ except SkyflowError as e:
         print(e.data) # see note below
     else:
         print(e)
+except Exception as general_error:
+    print('Unexpected Error Occurred:', general_error)
 ```
 
 Sample response:
@@ -886,8 +906,10 @@ try:
 
     response = client.invoke_connection(connectionConfig)
     print('Response:', response)
-except SkyflowError as e:
-    print('Error Occurred:', e)
+except SkyflowError as skyflow_error:
+    print('Skyflow Error Occurred:', skyflow_error)
+except Exception as general_error:
+    print('Unexpected Error Occurred:', general_error)
 ```
 
 Sample response:
@@ -928,6 +950,8 @@ except SkyflowError as e:
         print(e.data)
     else:
         print(e.message)
+except Exception as general_error:
+    print('Unexpected Error Occurred:', general_error)
 ```
 
 Sample Response
diff --git a/samples/delete_sample.py b/samples/delete_sample.py
index 85137e6f..bfe05713 100644
--- a/samples/delete_sample.py
+++ b/samples/delete_sample.py
@@ -36,5 +36,7 @@ def token_provider():
 
     response = client.delete(data,options=options)
     print('Response:', response)
-except SkyflowError as e:
-    print('Error Occurred:', e)
+except SkyflowError as skyflow_error:
+    print('Skyflow Error Occurred:', skyflow_error)
+except Exception as general_error:
+    print('Unexpected Error Occurred:', general_error)
\ No newline at end of file
diff --git a/samples/detokenize_sample.py b/samples/detokenize_sample.py
index 4cfae8c1..f986dedd 100644
--- a/samples/detokenize_sample.py
+++ b/samples/detokenize_sample.py
@@ -37,5 +37,7 @@ def token_provider():
         }
     response = client.detokenize(data)
     print('Response:', response)
-except SkyflowError as e:
-    print('Error Occurred:', e)
+except SkyflowError as skyflow_error:
+    print('Skyflow Error Occurred:', skyflow_error)
+except Exception as general_error:
+    print('Unexpected Error Occurred:', general_error)
diff --git a/samples/detokenize_with_continue_on_error_sample.py b/samples/detokenize_with_continue_on_error_sample.py
index 18927fc1..130d1372 100644
--- a/samples/detokenize_with_continue_on_error_sample.py
+++ b/samples/detokenize_with_continue_on_error_sample.py
@@ -21,15 +21,19 @@ def detokenize(client, data):
     try:
         response = client.detokenize(data, DetokenizeOptions(continueOnError=True))
         print('Response:', response)
-    except SkyflowError as e:
-        print('Error Occurred:', e)
+    except SkyflowError as skyflow_error:
+        print('Skyflow Error Occurred:', skyflow_error)
+    except Exception as general_error:
+        print('Unexpected Error Occurred:', general_error)
 
 def bulkDetokenize(client, data):
     try:
         response = client.detokenize(data, DetokenizeOptions(continueOnError=False))
         print('Response:', response)
-    except SkyflowError as e:
-        print('Error Occurred:', e)
+    except SkyflowError as skyflow_error:
+        print('Skyflow Error Occurred:', skyflow_error)
+    except Exception as general_error:
+        print('Unexpected Error Occurred:', general_error)
 
 try:
     config = Configuration(
@@ -50,5 +54,7 @@ def bulkDetokenize(client, data):
     
     detokenize(client, data)
     bulkDetokenize(client, data)
-except Exception as e:
-    print('Something went wrong:', e)
+except SkyflowError as skyflow_error:
+    print('Skyflow Error Occurred:', skyflow_error)
+except Exception as general_error:
+    print('Unexpected Error Occurred:', general_error)
diff --git a/samples/generate_bearer_token_from_creds_sample.py b/samples/generate_bearer_token_from_creds_sample.py
index 7c36c47e..c4b37458 100644
--- a/samples/generate_bearer_token_from_creds_sample.py
+++ b/samples/generate_bearer_token_from_creds_sample.py
@@ -41,5 +41,7 @@ def token_provider():
     accessToken, tokenType = token_provider()
     print("Access Token:", accessToken)
     print("Type of token:", tokenType)
-except SkyflowError as e:
-    print(e)
+except SkyflowError as skyflow_error:
+    print('Skyflow Error Occurred:', skyflow_error)
+except Exception as general_error:
+    print('Unexpected Error Occurred:', general_error)
diff --git a/samples/get_by_ids_sample.py b/samples/get_by_ids_sample.py
index 9eeece8d..0c63e2d5 100644
--- a/samples/get_by_ids_sample.py
+++ b/samples/get_by_ids_sample.py
@@ -32,5 +32,7 @@ def token_provider():
 
     response = client.get_by_id(data)
     print('Response:', response)
-except SkyflowError as e:
-    print('Error Occurred:', e)
+except SkyflowError as skyflow_error:
+    print('Skyflow Error Occurred:', skyflow_error)
+except Exception as general_error:
+    print('Unexpected Error Occurred:', general_error)
diff --git a/samples/get_sample.py b/samples/get_sample.py
index 3a741864..e67cd29e 100644
--- a/samples/get_sample.py
+++ b/samples/get_sample.py
@@ -41,5 +41,7 @@ def token_provider():
 
     response = client.get(data,options=options)
     print('Response:', response)
-except SkyflowError as e:
-    print('Error Occurred:', e)
+except SkyflowError as skyflow_error:
+    print('Skyflow Error Occurred:', skyflow_error)
+except Exception as general_error:
+    print('Unexpected Error Occurred:', general_error)
diff --git a/samples/get_with_options.py b/samples/get_with_options.py
index 8fda1136..3b00f923 100644
--- a/samples/get_with_options.py
+++ b/samples/get_with_options.py
@@ -30,5 +30,7 @@ def token_provider():
 
     response = client.get(data,options=options)
     print('Response:', response)
-except SkyflowError as e:
-    print('Error Occurred:', e)
+except SkyflowError as skyflow_error:
+    print('Skyflow Error Occurred:', skyflow_error)
+except Exception as general_error:
+    print('Unexpected Error Occurred:', general_error)
diff --git a/samples/insert_sample.py b/samples/insert_sample.py
index 14756c92..90916962 100644
--- a/samples/insert_sample.py
+++ b/samples/insert_sample.py
@@ -34,5 +34,7 @@ def token_provider():
     }
     response = client.insert(data, options=options)
     print('Response:', response)
-except SkyflowError as e:
-    print('Error Occurred:', e)
+except SkyflowError as skyflow_error:
+    print('Skyflow Error Occurred:', skyflow_error)
+except Exception as general_error:
+    print('Unexpected Error Occurred:', general_error)
diff --git a/samples/insert_upsert_sample.py b/samples/insert_upsert_sample.py
index aec06c49..b37e93dc 100644
--- a/samples/insert_upsert_sample.py
+++ b/samples/insert_upsert_sample.py
@@ -35,5 +35,7 @@ def token_provider():
     }
     response = client.insert(data, options=options)
     print('Response:', response)
-except SkyflowError as e:
-    print('Error Occurred:', e)
+except SkyflowError as skyflow_error:
+    print('Skyflow Error Occurred:', skyflow_error)
+except Exception as general_error:
+    print('Unexpected Error Occurred:', general_error)
diff --git a/samples/insert_with_continue_on_error_sample.py b/samples/insert_with_continue_on_error_sample.py
index 19df2b20..d239900c 100644
--- a/samples/insert_with_continue_on_error_sample.py
+++ b/samples/insert_with_continue_on_error_sample.py
@@ -40,5 +40,7 @@ def token_provider():
     }
     response = client.insert(data, options=options)
     print('Response:', response)
-except SkyflowError as e:
-    print('Error Occurred:', e)
+except SkyflowError as skyflow_error:
+    print('Skyflow Error Occurred:', skyflow_error)
+except Exception as general_error:
+    print('Unexpected Error Occurred:', general_error)
diff --git a/samples/invoke_connection_sample.py b/samples/invoke_connection_sample.py
index 7cf54319..7630f2e1 100644
--- a/samples/invoke_connection_sample.py
+++ b/samples/invoke_connection_sample.py
@@ -40,5 +40,7 @@ def token_provider():
 
     response = client.invoke_connection(connectionConfig)
     print('Response:', response)
-except SkyflowError as e:
-    print('Error Occurred:', e)
+except SkyflowError as skyflow_error:
+    print('Skyflow Error Occurred:', skyflow_error)
+except Exception as general_error:
+    print('Unexpected Error Occurred:', general_error)
diff --git a/samples/query_sample.py b/samples/query_sample.py
index 6b4d507c..871beacc 100644
--- a/samples/query_sample.py
+++ b/samples/query_sample.py
@@ -28,8 +28,7 @@ def token_provider():
     }
     response = client.query(data)
     print('Response:', response)
-except SkyflowError as e:
-    if(e.data):
-        print('Error Occurred:', e.data)
-    else:
-        print('Error Occurred:', e.message)
\ No newline at end of file
+except SkyflowError as skyflow_error:
+    print('Skyflow Error Occurred:', skyflow_error)
+except Exception as general_error:
+    print('Unexpected Error Occurred:', general_error)
\ No newline at end of file
diff --git a/samples/sa_token_sample.py b/samples/sa_token_sample.py
index 9169cb4b..2c257b73 100644
--- a/samples/sa_token_sample.py
+++ b/samples/sa_token_sample.py
@@ -22,5 +22,7 @@ def token_provider():
     accessToken, tokenType = token_provider()
     print("Access Token:", accessToken)
     print("Type of token:", tokenType)
-except SkyflowError as e:
-    print(e)
+except SkyflowError as skyflow_error:
+    print('Skyflow Error Occurred:', skyflow_error)
+except Exception as general_error:
+    print('Unexpected Error Occurred:', general_error)
diff --git a/samples/update_sample.py b/samples/update_sample.py
index 9c6ea907..0429b5bf 100644
--- a/samples/update_sample.py
+++ b/samples/update_sample.py
@@ -35,5 +35,7 @@ def token_provider():
     }
     response = client.update(data, options=options)
     print('Response:', response)
-except SkyflowError as e:
-    print('Error Occurred:', e)
+except SkyflowError as skyflow_error:
+    print('Skyflow Error Occurred:', skyflow_error)
+except Exception as general_error:
+    print('Unexpected Error Occurred:', general_error)