diff --git a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/AbstractSqlEamDb.java b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/AbstractSqlEamDb.java
index 78937a221f..b405965b6b 100644
--- a/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/AbstractSqlEamDb.java
+++ b/Core/src/org/sleuthkit/autopsy/centralrepository/datamodel/AbstractSqlEamDb.java
@@ -986,13 +986,25 @@ abstract class AbstractSqlEamDb implements EamDb {
                             if (!eamArtifact.getCorrelationValue().isEmpty()) {
 
                                 if (eamInstance.getCorrelationCase() == null) {
-                                    throw new EamDbException("CorrelationAttributeInstance case is null for :");
+                                    throw new EamDbException("CorrelationAttributeInstance case is null for: "
+                                            + "\n\tCorrelationArtifact ID: " + eamArtifact.getID()
+                                            + "\n\tCorrelationArtifact Type: " + eamArtifact.getCorrelationType().getDisplayName()
+                                            + "\n\tCorrelationArtifact Value: " + eamArtifact.getCorrelationValue());
                                 }
                                 if (eamInstance.getCorrelationDataSource() == null) {
-                                    throw new EamDbException("CorrelationAttributeInstance data source is null");
+                                    throw new EamDbException("CorrelationAttributeInstance data source is null for: "
+                                            + "\n\tCorrelationArtifact ID: " + eamArtifact.getID()
+                                            + "\n\tCorrelationArtifact Type: " + eamArtifact.getCorrelationType().getDisplayName()
+                                            + "\n\tCorrelationArtifact Value: " + eamArtifact.getCorrelationValue());
                                 }
                                 if (eamInstance.getKnownStatus() == null) {
-                                    throw new EamDbException("CorrelationAttributeInstance known status is null");
+                                    throw new EamDbException("CorrelationAttributeInstance known status is null for: "
+                                            + "\n\tCorrelationArtifact ID: " + eamArtifact.getID()
+                                            + "\n\tCorrelationArtifact Type: " + eamArtifact.getCorrelationType().getDisplayName()
+                                            + "\n\tCorrelationArtifact Value: " + eamArtifact.getCorrelationValue() 
+                                            + "\n\tEam Instance: "
+                                            + "\n\t\tCaseId: " + eamInstance.getCorrelationDataSource().getCaseID()
+                                            + "\n\t\tDeviceID: " + eamInstance.getCorrelationDataSource().getDeviceID());
                                 }
 
                                 if (eamArtifact.getCorrelationValue().length() < MAX_VALUE_LENGTH) {
@@ -1010,13 +1022,13 @@ abstract class AbstractSqlEamDb implements EamDb {
                                     bulkPs.addBatch();
                                 } else {
                                     logger.log(Level.WARNING, ("Artifact value too long for central repository."
-                                            + "\nCorrelationArtifact ID: " + eamArtifact.getID()
-                                            + "\nCorrelationArtifact Type: " + eamArtifact.getCorrelationType().getDisplayName()
-                                            + "\nCorrelationArtifact Value: " + eamArtifact.getCorrelationValue())
-                                            + "\nEam Instance: "
-                                            + "\n\tCaseId: " + eamInstance.getCorrelationDataSource().getCaseID()
-                                            + "\n\tDeviceID: " + eamInstance.getCorrelationDataSource().getDeviceID()
-                                            + "\n\tFilePath: " + eamInstance.getFilePath());
+                                            + "\n\tCorrelationArtifact ID: " + eamArtifact.getID()
+                                            + "\n\tCorrelationArtifact Type: " + eamArtifact.getCorrelationType().getDisplayName()
+                                            + "\n\tCorrelationArtifact Value: " + eamArtifact.getCorrelationValue())
+                                            + "\n\tEam Instance: "
+                                            + "\n\t\tCaseId: " + eamInstance.getCorrelationDataSource().getCaseID()
+                                            + "\n\t\tDeviceID: " + eamInstance.getCorrelationDataSource().getDeviceID()
+                                            + "\n\t\tFilePath: " + eamInstance.getFilePath());
                                 }
                             }
                         }
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/SearchEngineURLQueryAnalyzer.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/SearchEngineURLQueryAnalyzer.java
index fdaa47e7ed..7bde8113a8 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/SearchEngineURLQueryAnalyzer.java
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/SearchEngineURLQueryAnalyzer.java
@@ -1,15 +1,15 @@
 /*
  * Autopsy Forensic Browser
- * 
+ *
  * Copyright 2012-2014 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *     http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -237,13 +237,19 @@ class SearchEngineURLQueryAnalyzer extends Extract {
         try { //try to decode the url
             String decoded = URLDecoder.decode(x, "UTF-8"); //NON-NLS
             return decoded;
-        } catch (UnsupportedEncodingException | IllegalArgumentException exception) { //if it fails, return the encoded string
+        } catch (UnsupportedEncodingException exception) { //if it fails, return the encoded string
             logger.log(Level.FINE, "Error during URL decoding, returning undecoded value:"
-                    + "\nURL: " + url
-                    + "\nUndecoded value: " + x
-                    + "\nEngine name: " + eng.getEngineName()
-                    + "\nEngine domain: " + eng.getDomainSubstring(), exception); //NON-NLS
-            
+                    + "\n\tURL: " + url
+                    + "\n\tUndecoded value: " + x
+                    + "\n\tEngine name: " + eng.getEngineName()
+                    + "\n\tEngine domain: " + eng.getDomainSubstring(), exception); //NON-NLS
+            return x;
+        } catch (IllegalArgumentException exception) { //if it fails, return the encoded string
+            logger.log(Level.SEVERE, "Illegal arguement Exception during URL decoding, returning undecoded value:"
+                    + "\n\tURL: " + url
+                    + "\n\tUndecoded value: " + x
+                    + "\n\tEngine name: " + eng.getEngineName()
+                    + "\n\tEngine domain: " + eng.getDomainSubstring(), exception); //NON-NLS)
             return x;
         }
     }