diff --git a/Core/src/org/sleuthkit/autopsy/modules/UserArtifacts/Bundle_ja.properties b/Core/src/org/sleuthkit/autopsy/modules/UserArtifacts/Bundle_ja.properties
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/Core/src/org/sleuthkit/autopsy/modules/UserArtifacts/UserArtifactIngestModule.java b/Core/src/org/sleuthkit/autopsy/modules/UserArtifacts/UserArtifactIngestModule.java
index eed24aa489..35ae84f9ff 100755
--- a/Core/src/org/sleuthkit/autopsy/modules/UserArtifacts/UserArtifactIngestModule.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/UserArtifacts/UserArtifactIngestModule.java
@@ -42,8 +42,8 @@ public class UserArtifactIngestModule implements DataSourceIngestModule {
         progressBar.switchToDeterminate(2);
         try {
             FileManager manager = Case.getCurrentCase().getServices().getFileManager();
-            List<AbstractFile> file1 = manager.findFiles("Sunset.jpg");
-            List<AbstractFile> file2 = manager.findFiles("Winter.jpg");
+            List<AbstractFile> file1 = manager.findFiles("Sunset.jpg"); //NON-NLS
+            List<AbstractFile> file2 = manager.findFiles("Winter.jpg"); //NON-NLS
             BlackboardArtifact art1;
             BlackboardArtifact art2;
             if (!file1.isEmpty()) {
@@ -56,8 +56,8 @@ public class UserArtifactIngestModule implements DataSourceIngestModule {
             } else {
                 art2 = dataSource.newArtifact(type2.getTypeID());
             }
-            BlackboardAttribute.Type attributeType = Case.getCurrentCase().getServices().getBlackboard().addAttributeType("Test", TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.LONG, "2");
-            BlackboardAttribute.Type attributeType2 = Case.getCurrentCase().getServices().getBlackboard().addAttributeType("Test2", TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.BYTE, "3");
+            BlackboardAttribute.Type attributeType = Case.getCurrentCase().getServices().getBlackboard().addAttributeType("Test", TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.LONG, "2"); //NON-NLS
+            BlackboardAttribute.Type attributeType2 = Case.getCurrentCase().getServices().getBlackboard().addAttributeType("Test2", TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.BYTE, "3"); //NON-NLS
             art1.addAttribute(new BlackboardAttribute(attributeType,
                     UserArtifactIngestModuleFactory.getModuleName(), -1L));
             progressBar.progress(1);
@@ -65,14 +65,16 @@ public class UserArtifactIngestModule implements DataSourceIngestModule {
                     UserArtifactIngestModuleFactory.getModuleName(), new byte[7]));
             progressBar.progress(1);
             IngestServices.getInstance().postMessage(IngestMessage.createDataMessage(
-                    "name",
+                    "name", // NON-NLS
                     UserArtifactIngestModuleFactory.getModuleName(),
-                    "Test Results",
-                    "Test",
+                    "Test Results", //NON-NLS
+                    "Test", //NON-NLS
                     art1));
             return ProcessResult.OK;
         } catch (TskCoreException ex) {
             return ProcessResult.ERROR;
+        } catch (TskDataException ex) {
+            return ProcessResult.ERROR;
         } catch (BlackboardException ex) {
             return ProcessResult.ERROR;
         }
@@ -82,10 +84,10 @@ public class UserArtifactIngestModule implements DataSourceIngestModule {
     public void startUp(IngestJobContext context) throws IngestModuleException {
         this.context = context;
         try {
-            type1 = Case.getCurrentCase().getServices().getBlackboard().addArtifactType("This is", "a test");
-            type2 = Case.getCurrentCase().getServices().getBlackboard().addArtifactType("Another", "kinda test");
+            type1 = Case.getCurrentCase().getServices().getBlackboard().addArtifactType("This is", "a test"); //NON-NLS
+            type2 = Case.getCurrentCase().getServices().getBlackboard().addArtifactType("Another", "kinda test"); //NON-NLS
         } catch (BlackboardException ex) {
-            Logger.logMsg(Logger.ERROR, "Startup failed");
+            Logger.logMsg(Logger.ERROR, "Startup failed"); //NON-NLS
         }
     }
 }