diff --git a/libs/android.py b/libs/android.py
index 9e65fe5..0d5f8d2 100644
--- a/libs/android.py
+++ b/libs/android.py
@@ -24,6 +24,7 @@ class AndroidAppPull:
     if (0 < stdout.find('failed')):
       logging.error("Error executing adb shell")
       logging.info("Make sure adb is in root mode, 'adb root'")
+      return dir_names
 
     strings = stdout.split('\n')
     for sstr in strings:
diff --git a/libs/fingerprint.py b/libs/fingerprint.py
index b3e66e6..18ae230 100644
--- a/libs/fingerprint.py
+++ b/libs/fingerprint.py
@@ -1,6 +1,7 @@
 #
 #
 #
+import os
 import re
 import json
 import sqlite3
@@ -73,8 +74,9 @@ class FingerprintDB:
 
     try:
       # extract file name from path+filename
-      self.metadata['db-name'] = ToolBox.parseFilenameIncExt(filein)
-    except:
+      self.metadata['db-name'] = os.path.basename(filein)
+    except Exception as ex:
+      logging.error(ex)
       self.metadata['db-name'] = filein
     try:
       # read database schema, parse the schema