diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/ImageUtils.java b/Core/src/org/sleuthkit/autopsy/coreutils/ImageUtils.java
index 42c11fa2fa..19933f8247 100755
--- a/Core/src/org/sleuthkit/autopsy/coreutils/ImageUtils.java
+++ b/Core/src/org/sleuthkit/autopsy/coreutils/ImageUtils.java
@@ -137,6 +137,8 @@ public class ImageUtils {
         OPEN_CV_LOADED = openCVLoadedTemp;
         SUPPORTED_IMAGE_EXTENSIONS.addAll(Arrays.asList(ImageIO.getReaderFileSuffixes()));
         SUPPORTED_IMAGE_EXTENSIONS.add("tec"); // Add JFIF .tec files
+        SUPPORTED_IMAGE_EXTENSIONS.removeIf("db"::equals); // remove db files
+        
         SUPPORTED_IMAGE_MIME_TYPES = new TreeSet<>(Arrays.asList(ImageIO.getReaderMIMETypes()));
         /*
          * special cases and variants that we support, but don't get registered
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java
index 420533eaf1..dc3e3b7a28 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Server.java
@@ -565,7 +565,7 @@ public class Server {
         try {
             // Close any open core before stopping server
             closeCore();
-        } catch (KeywordSearchModuleException | NoOpenCoreException e) {
+        } catch (KeywordSearchModuleException e) {
             logger.log(Level.WARNING, "Failed to close core: ", e); //NON-NLS
         }
 
@@ -704,15 +704,14 @@ public class Server {
         }
     }
     
-    void closeCore() throws KeywordSearchModuleException, NoOpenCoreException {
+    void closeCore() throws KeywordSearchModuleException {
         currentCoreLock.writeLock().lock();
         try {
-            if (null == currentCore) {
-                throw new NoOpenCoreException();
+            if (null != currentCore) {
+                currentCore.close();
+                currentCore = null;
+                serverAction.putValue(CORE_EVT, CORE_EVT_STATES.STOPPED);
             }
-            currentCore.close();
-            currentCore = null;
-            serverAction.putValue(CORE_EVT, CORE_EVT_STATES.STOPPED);
         } finally {
             currentCoreLock.writeLock().unlock();
         }
@@ -760,7 +759,7 @@ public class Server {
                     closeCore();
                 }
             }
-        } catch (KeywordSearchModuleException | NoOpenCoreException ex) {
+        } catch (KeywordSearchModuleException ex) {
             throw new KeywordSearchServiceException(NbBundle.getMessage(Server.class, "Server.close.exception.msg"), ex);
         } finally {
             currentCoreLock.readLock().unlock();
diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SolrSearchService.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SolrSearchService.java
index 2e1a10770c..63ee08c10c 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SolrSearchService.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/SolrSearchService.java
@@ -375,7 +375,7 @@ public class SolrSearchService implements KeywordSearchService, AutopsyService {
 
         try {
             KeywordSearch.getServer().closeCore();
-        } catch (KeywordSearchModuleException | NoOpenCoreException ex) {
+        } catch (KeywordSearchModuleException ex) {
             throw new AutopsyServiceException(String.format("Failed to close core for %s", context.getCase().getCaseDirectory()), ex);
         }
     }