diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestDataSourceThread.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestDataSourceThread.java
index 591b6f2ebb..40e01c81eb 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestDataSourceThread.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestDataSourceThread.java
@@ -47,6 +47,7 @@ public class IngestDataSourceThread extends SwingWorker<Void, Void> {
     private IngestDataSourceWorkerController controller;
     private final IngestManager manager;
     private final IngestModuleInit init;
+    private boolean inited;
     //current method of enqueuing data source ingest modules with locks and internal lock queue
     //ensures that we init, run and complete a single data source ingest module at a time
     //uses fairness policy to run them in order enqueued
@@ -59,6 +60,7 @@ public class IngestDataSourceThread extends SwingWorker<Void, Void> {
         this.dataSource = dataSource;
         this.module = module;
         this.init = init;
+        this.inited = false;
     }
 
     PipelineContext<IngestModuleDataSource>getContext() {
@@ -72,6 +74,20 @@ public class IngestDataSourceThread extends SwingWorker<Void, Void> {
     IngestModuleDataSource getModule() {
         return module;
     }
+    
+    public void init() {
+        
+        logger.log(Level.INFO, "Initializing module: " + module.getName());
+        try {
+            module.init(init);
+            inited = true;
+        } catch (Exception e) {
+            logger.log(Level.INFO, "Failed initializing module: " + module.getName() + ", will not run.");
+            //will not run
+            inited = false;
+            throw e;
+        }
+    }
 
     @Override
     protected Void doInBackground() throws Exception {
@@ -102,15 +118,10 @@ public class IngestDataSourceThread extends SwingWorker<Void, Void> {
             logger.log(Level.INFO, PlatformUtil.getAllMemUsageInfo());
             progress.setDisplayName(displayName);
 
-            logger.log(Level.INFO, "Initializing module: " + module.getName());
-            try {
-                module.init(init);
-            } catch (Exception e) {
-                logger.log(Level.INFO, "Failed initializing module: " + module.getName() + ", will not run.");
+            if (inited == false) {
+                logger.log(Level.INFO, "Module wasn't initialized, will not run: " + module.getName());
                 return Void.TYPE.newInstance();
-                //will not run
             }
-
             logger.log(Level.INFO, "Starting processing of module: " + module.getName());
 
             controller = new IngestDataSourceWorkerController(this, progress);
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java b/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
index bac91dbc0b..5f573cab06 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/IngestManager.java
@@ -37,6 +37,7 @@ import javax.swing.SwingWorker;
 import org.netbeans.api.progress.ProgressHandle;
 import org.netbeans.api.progress.ProgressHandleFactory;
 import org.openide.util.Cancellable;
+import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
 import org.sleuthkit.autopsy.coreutils.PlatformUtil;
 import org.sleuthkit.autopsy.coreutils.StopWatch;
 import org.sleuthkit.autopsy.ingest.IngestMessage.MessageType;
@@ -292,7 +293,8 @@ public class IngestManager {
     private synchronized void startAll() {
         final IngestScheduler.DataSourceScheduler dataSourceScheduler = scheduler.getDataSourceScheduler();
         final IngestScheduler.FileScheduler fileScheduler = scheduler.getFileScheduler();
-
+        boolean allInited = true;
+        IngestModuleAbstract failedModule = null;
         logger.log(Level.INFO, "DataSource queue: " + dataSourceScheduler.toString());
         logger.log(Level.INFO, "File queue: " + fileScheduler.toString());
 
@@ -300,9 +302,13 @@ public class IngestManager {
             ingestMonitor.start();
         }
 
+        List<IngestDataSourceThread> newThreads = new ArrayList<>();
         //image ingesters
         // cycle through each data source content in the queue
         while (dataSourceScheduler.hasNext()) {
+            if (allInited == false) {
+                break;
+            }
             //dequeue
             // get next data source content and set of modules
             final ScheduledTask<IngestModuleDataSource> dataSourceTask = dataSourceScheduler.next();
@@ -335,15 +341,31 @@ public class IngestManager {
                             new PipelineContext<IngestModuleDataSource>(dataSourceTask, getProcessUnallocSpace());
                     final IngestDataSourceThread newDataSourceWorker = new IngestDataSourceThread(this,
                             dataSourcepipelineContext, dataSourceTask.getContent(), taskModule, moduleInit);
-
+                    try {
+                        newDataSourceWorker.init();
+                    } catch (Exception e) {
+                        logger.log(Level.SEVERE, "DataSource ingest module failed init(): " + taskModule.getName(), e);
+                        allInited = false;
+                        failedModule = taskModule;
+                        break;
+                    }
                     dataSourceIngesters.add(newDataSourceWorker);
-
-                    //wrap the module in a worker, that will run init, process and complete on the module
-                    newDataSourceWorker.execute();
-                    IngestManager.fireModuleEvent(IngestModuleEvent.STARTED.toString(), taskModule.getName());
+                    // Add the worker to the list of new IngestThreads to be started
+                    // if all modules initialize.
+                    newThreads.add(newDataSourceWorker);
                 }
             }
         }
+        
+        // Check to make sure all modules initialized
+        if (allInited == false) {
+            MessageNotifyUtil.Message.error("Failed to load " + failedModule.getName() + "ingest module.\n"
+                                            + "No ingest modules will be run. Please disable the module"
+                                            + " or fix the error and restart ingest by right clicking on"
+                                            + " the data source and selecting re-run ingest.");
+            dataSourceIngesters.removeAll(newThreads);
+            return;
+        }
 
         //AbstractFile ingester
         boolean startAbstractFileIngester = false;
@@ -365,19 +387,40 @@ public class IngestManager {
             stats = new IngestManagerStats();
             abstractFileIngester = new IngestAbstractFileProcessor();
             //init all fs modules, everytime new worker starts
-            /* @@@ I don't understand why we do an init on each module.  Should do only modules
-             * that we are going to be using in the pipeline
-             */
+
             for (IngestModuleAbstractFile s : abstractFileModules) {
+                if (fileScheduler.hasModuleEnqueued(s) == false) {
+                    continue;
+                } 
                 IngestModuleInit moduleInit = new IngestModuleInit();
                 try {
                     s.init(moduleInit);
                 } catch (Exception e) {
                     logger.log(Level.SEVERE, "File ingest module failed init(): " + s.getName(), e);
-                    postMessage(IngestMessage.createErrorMessage(++messageID, s, "Failed to load " + s.getName(), ""));
+                    allInited = false;
+                    failedModule = s;
+                    break;
                 }
             }
-            abstractFileIngester.execute();
+        }
+        
+        if (allInited) {
+            // Start DataSourceIngestModules
+            for (IngestDataSourceThread dataSourceWorker : newThreads) {
+                dataSourceWorker.execute();
+                IngestManager.fireModuleEvent(IngestModuleEvent.STARTED.toString(), dataSourceWorker.getModule().getName());
+            }
+            // Start AbstractFileIngestModules
+            if (startAbstractFileIngester) {
+                abstractFileIngester.execute();
+            }
+        } else {
+            MessageNotifyUtil.Message.error("Failed to load " + failedModule.getName() + "ingest module.\n"
+                                            + "No ingest modules will be run. Please disable the module"
+                                            + " or fix the error and restart ingest by right clicking on"
+                                            + " the data source and selecting re-run ingest.");
+            dataSourceIngesters.removeAll(newThreads);
+            abstractFileIngester = null;
         }
     }