diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/eventlisteners/CaseEventListener.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/eventlisteners/CaseEventListener.java
index 8ac53d556f..053eeebbc3 100644
--- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/eventlisteners/CaseEventListener.java
+++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/eventlisteners/CaseEventListener.java
@@ -61,6 +61,10 @@ public class CaseEventListener implements PropertyChangeListener {
         EamDb dbManager = EamDb.getInstance();
         switch (Case.Events.valueOf(evt.getPropertyName())) {
             case CONTENT_TAG_ADDED: {
+                if (!dbManager.isEnabled()) {
+                    return;
+                }
+
                 final ContentTagAddedEvent tagAddedEvent = (ContentTagAddedEvent) evt;
                 final ContentTag tagAdded = tagAddedEvent.getAddedTag();
                 // TODO: detect failed cast and break if so.
@@ -121,6 +125,10 @@ public class CaseEventListener implements PropertyChangeListener {
             break;
 
             case BLACKBOARD_ARTIFACT_TAG_ADDED: {
+                if (!dbManager.isEnabled()) {
+                    return;
+                }
+
                 final BlackBoardArtifactTagAddedEvent bbTagAddedEvent = (BlackBoardArtifactTagAddedEvent) evt;
                 final BlackboardArtifactTag bbTagAdded = bbTagAddedEvent.getAddedTag();
                 final AbstractFile af = (AbstractFile) bbTagAdded.getContent();
@@ -149,12 +157,13 @@ public class CaseEventListener implements PropertyChangeListener {
             break;
 
             case DATA_SOURCE_ADDED: {
-                final DataSourceAddedEvent dataSourceAddedEvent = (DataSourceAddedEvent) evt;
-                Content newDataSource = dataSourceAddedEvent.getDataSource();
                 if (!dbManager.isEnabled()) {
                     break;
                 }
 
+                final DataSourceAddedEvent dataSourceAddedEvent = (DataSourceAddedEvent) evt;
+                Content newDataSource = dataSourceAddedEvent.getDataSource();
+
                 try {
                     String deviceId = Case.getCurrentCase().getSleuthkitCase().getDataSource(newDataSource.getId()).getDeviceId();
 
diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/eventlisteners/IngestEventsListener.java b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/eventlisteners/IngestEventsListener.java
index 11cf6c60cf..bcd1f3abeb 100644
--- a/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/eventlisteners/IngestEventsListener.java
+++ b/Experimental/src/org/sleuthkit/autopsy/experimental/enterpriseartifactsmanager/eventlisteners/IngestEventsListener.java
@@ -79,7 +79,6 @@ public class IngestEventsListener {
             switch (IngestManager.IngestModuleEvent.valueOf(evt.getPropertyName())) {
                 case DATA_ADDED: {
                     if (!dbManager.isEnabled()) {
-                        LOGGER.log(Level.WARNING, "Error connecting to database, enteprise artifact manager artifacts not created");
                         return;
                     }