diff --git a/InternalPythonModules/android/installedapps.py b/InternalPythonModules/android/installedapps.py
index b830b050cd..ceb8526924 100644
--- a/InternalPythonModules/android/installedapps.py
+++ b/InternalPythonModules/android/installedapps.py
@@ -39,6 +39,7 @@ from org.sleuthkit.datamodel import BlackboardArtifact
 from org.sleuthkit.datamodel import BlackboardAttribute
 from org.sleuthkit.datamodel import Content
 from org.sleuthkit.datamodel import TskCoreException
+from org.sleuthkit.datamodel.Blackboard import BlackboardException
 from org.sleuthkit.datamodel.blackboardutils import ArtifactsHelper
 
 import traceback
@@ -71,8 +72,8 @@ class InstalledApplicationsAnalyzer(general.AndroidComponentAnalyzer):
             
             except SQLException as ex:
                 self._logger.log(Level.WARNING, "Error processing query result for installed applications. ", ex)
-            except TskCoreException as ex:
-                self._logger.log(Level.WARNING, "Failed to create ArtifactsHelper for adding installed applications.", ex)
+            except (TskCoreException, BlackboardException) as ex:
+                self._logger.log(Level.WARNING, "Failed to adding installed application artifacts.", ex)
             finally:
                 libraryDb.close()
     
diff --git a/InternalPythonModules/android/operabrowser.py b/InternalPythonModules/android/operabrowser.py
index 8abbef2792..876c5063dc 100644
--- a/InternalPythonModules/android/operabrowser.py
+++ b/InternalPythonModules/android/operabrowser.py
@@ -39,6 +39,7 @@ from org.sleuthkit.datamodel import BlackboardArtifact
 from org.sleuthkit.datamodel import BlackboardAttribute
 from org.sleuthkit.datamodel import Content
 from org.sleuthkit.datamodel import TskCoreException
+from org.sleuthkit.datamodel.Blackboard import BlackboardException
 from org.sleuthkit.datamodel.blackboardutils import WebBrowserArtifactsHelper
 
 import traceback
@@ -74,8 +75,8 @@ class OperaAnalyzer(general.AndroidComponentAnalyzer):
 
                 except SQLException as ex:
                     self._logger.log(Level.WARNING, "Error processing query results for Opera cookies.", ex)
-                except TskCoreException as ex:
-                    self._logger.log(Level.WARNING, "Failed to create WebBrowserArtifactsHelper for adding Opera cookies.", ex)
+                except (TskCoreException, BlackboardException) as ex:
+                    self._logger.log(Level.WARNING, "Failed to add Opera cookie artifacts.", ex)
                 finally:      
                     cookiesDb.close()                    
             	
@@ -98,8 +99,8 @@ class OperaAnalyzer(general.AndroidComponentAnalyzer):
                                                         self.progName)
                 except SQLException as ex:
                     self._logger.log(Level.WARNING, "Error processing query results for Opera history.", ex)
-                except TskCoreException as ex:
-                    self._logger.log(Level.WARNING, "Failed to create WebBrowserArtifactsHelper for adding Opera history.", ex)
+                except (TskCoreException, BlackboardException) as ex:
+                    self._logger.log(Level.WARNING, "Failed to add Opera history artifacts.", ex)
                 finally:        
                     historyDb.close()                    
                 
@@ -124,8 +125,8 @@ class OperaAnalyzer(general.AndroidComponentAnalyzer):
                 
                 except SQLException as ex:
                     self._logger.log(Level.WARNING, "Error processing query results for Opera downloads.", ex)
-                except TskCoreException as ex:
-                    self._logger.log(Level.WARNING, "Failed to create WebBrowserArtifactsHelper for adding Opera downloads.", ex)
+                except (TskCoreException, BlackboardException) as ex:
+                    self._logger.log(Level.WARNING, "Failed to add Opera download artifacts.", ex)
                 finally:
                     downloadsDb.close()                    
                 
@@ -147,8 +148,8 @@ class OperaAnalyzer(general.AndroidComponentAnalyzer):
                 
                 except SQLException as ex:
                     self._logger.log(Level.WARNING, "Error processing query results for Opera autofill.", ex)
-                except TskCoreException as ex:
-                    self._logger.log(Level.WARNING, "Failed to create WebBrowserArtifactsHelper for adding Opera autofill.", ex)
+                except (TskCoreException, BlackboardException) as ex:
+                    self._logger.log(Level.WARNING, "Failed to add Opera autofill artifacts.", ex)
                 finally:
                     autofillDb.close()
 
@@ -185,8 +186,8 @@ class OperaAnalyzer(general.AndroidComponentAnalyzer):
                 
                 except SQLException as ex:
                     self._logger.log(Level.WARNING, "Error processing query results for Opera web form addresses.", ex)
-                except TskCoreException as ex:
-                    self._logger.log(Level.WARNING, "Failed to create WebBrowserArtifactsHelper for adding Opera form addresses.", ex)
+                except (TskCoreException, BlackboardException) as ex:
+                    self._logger.log(Level.WARNING, "Failed to add Opera form address artifacts.", ex)
                 finally:
                     webFormAddressDb.close()
                     
diff --git a/InternalPythonModules/android/oruxmaps.py b/InternalPythonModules/android/oruxmaps.py
index b4f63ed187..87f243e8af 100644
--- a/InternalPythonModules/android/oruxmaps.py
+++ b/InternalPythonModules/android/oruxmaps.py
@@ -42,6 +42,7 @@ from org.sleuthkit.datamodel import BlackboardArtifact
 from org.sleuthkit.datamodel import BlackboardAttribute
 from org.sleuthkit.datamodel import Content
 from org.sleuthkit.datamodel import TskCoreException
+from org.sleuthkit.datamodel.Blackboard import BlackboardException
 from org.sleuthkit.datamodel.blackboardutils import ArtifactsHelper
 
 import traceback
@@ -88,7 +89,7 @@ class OruxMapsAnalyzer(general.AndroidComponentAnalyzer):
                                             self.programName)
             except SQLException as ex:
                 self._logger.log(Level.WARNING, "Error processing query result for Orux Map trackpoints.", ex)
-            except TskCoreException as ex:
-                self._logger.log(Level.WARNING, "Failed to create ArtifactsHelper for adding Orux Map trackpoints.", ex)
+            except (TskCoreException, BlackboardException) as ex:
+                self._logger.log(Level.WARNING, "Failed to add Orux Map trackpoint artifacts.", ex)
             finally:
                 oruxMapsTrackpointsDb.close()
diff --git a/InternalPythonModules/android/sbrowser.py b/InternalPythonModules/android/sbrowser.py
index 85b477405e..ed15fdd7d6 100644
--- a/InternalPythonModules/android/sbrowser.py
+++ b/InternalPythonModules/android/sbrowser.py
@@ -39,6 +39,7 @@ from org.sleuthkit.datamodel import BlackboardArtifact
 from org.sleuthkit.datamodel import BlackboardAttribute
 from org.sleuthkit.datamodel import Content
 from org.sleuthkit.datamodel import TskCoreException
+from org.sleuthkit.datamodel.Blackboard import BlackboardException
 from org.sleuthkit.datamodel.blackboardutils import WebBrowserArtifactsHelper
 
 import traceback
@@ -72,8 +73,8 @@ class SBrowserAnalyzer(general.AndroidComponentAnalyzer):
                                                         self.progName)
                 except SQLException as ex:
                     self._logger.log(Level.WARNING, "Error processing query results for SBrowser bookmarks.", ex)
-                except TskCoreException as ex:
-                    self._logger.log(Level.WARNING, "Failed to create WebBrowserArtifactsHelper for adding bookmarks.", ex)
+                except (TskCoreException, BlackboardException) as ex:
+                    self._logger.log(Level.WARNING, "Failed to add SBrowser bookmark artifacts.", ex)
                 finally:  
                     sbrowserDb.close()                    
             	
@@ -97,8 +98,8 @@ class SBrowserAnalyzer(general.AndroidComponentAnalyzer):
 
                 except SQLException as ex:
                     self._logger.log(Level.WARNING, "Error processing query results for SBrowser cookies.", ex)
-                except TskCoreException as ex:
-                    self._logger.log(Level.WARNING, "Failed to create WebBrowserArtifactsHelper for adding SBrowser cookies.", ex)
+                except (TskCoreException, BlackboardException) as ex:
+                    self._logger.log(Level.WARNING, "Failed to add SBrowser cookie artifacts.", ex)
                 finally:      
                     cookiesDb.close()                    
             	
@@ -121,8 +122,8 @@ class SBrowserAnalyzer(general.AndroidComponentAnalyzer):
                                                         self.progName)
                 except SQLException as ex:
                     self._logger.log(Level.WARNING, "Error processing query results for SBrowser history.", ex)
-                except TskCoreException as ex:
-                    self._logger.log(Level.WARNING, "Failed to create WebBrowserArtifactsHelper for adding SBrowser history.", ex)
+                except (TskCoreException, BlackboardException) as ex:
+                    self._logger.log(Level.WARNING, "Failed to add SBrowser history artifacts.", ex)
                 finally:        
                     historyDb.close()                    
                 
@@ -147,8 +148,8 @@ class SBrowserAnalyzer(general.AndroidComponentAnalyzer):
                 
                 except SQLException as ex:
                     self._logger.log(Level.WARNING, "Error processing query results for SBrowser downloads.", ex)
-                except TskCoreException as ex:
-                    self._logger.log(Level.WARNING, "Failed to create WebBrowserArtifactsHelper for adding SBrowser downloads.", ex)
+                except (TskCoreException, BlackboardException) as ex:
+                    self._logger.log(Level.WARNING, "Failed to add SBrowser download artifacts.", ex)
                 finally:
                     downloadsDb.close()                    
                 
@@ -170,8 +171,8 @@ class SBrowserAnalyzer(general.AndroidComponentAnalyzer):
                 
                 except SQLException as ex:
                     self._logger.log(Level.WARNING, "Error processing query results for SBrowser autofill.", ex)
-                except TskCoreException as ex:
-                    self._logger.log(Level.WARNING, "Failed to create WebBrowserArtifactsHelper for adding SBrowser autofill.", ex)
+                except (TskCoreException, BlackboardException) as ex:
+                    self._logger.log(Level.WARNING, "Failed to add SBrowser autofill artifacts.", ex)
                 finally:
                     autofillDb.close()
 
@@ -208,8 +209,8 @@ class SBrowserAnalyzer(general.AndroidComponentAnalyzer):
                 
                 except SQLException as ex:
                     self._logger.log(Level.WARNING, "Error processing query results for SBrowser form addresses.", ex)
-                except TskCoreException as ex:
-                    self._logger.log(Level.WARNING, "Failed to create WebBrowserArtifactsHelper for adding SBrowser form addresses.", ex)
+                except (TskCoreException, BlackboardException) as ex:
+                    self._logger.log(Level.WARNING, "Failed to add SBrowser form address artifacts.", ex)
                 finally:
                     webFormAddressDb.close()