diff --git a/Core/src/org/sleuthkit/autopsy/core/Bundle.properties b/Core/src/org/sleuthkit/autopsy/core/Bundle.properties
index ce42cbc6e8..becba527a5 100644
--- a/Core/src/org/sleuthkit/autopsy/core/Bundle.properties
+++ b/Core/src/org/sleuthkit/autopsy/core/Bundle.properties
@@ -19,4 +19,6 @@ ServicesMonitor.failedMessageService.notify.msg=Lost connection to messaging ser
 ServicesMonitor.restoredService.notify.title=Collaboration Service Restored
 ServicesMonitor.restoredDbService.notify.msg=Connection to remote database server restored
 ServicesMonitor.restoredSolrService.notify.msg=Connection to remote keyword search server restored
-ServicesMonitor.restoredMessageService.notify.msg=Connection to messaging server restored
\ No newline at end of file
+ServicesMonitor.restoredMessageService.notify.msg=Connection to messaging server restored
+ServicesMonitor.nullServiceName.excepton.txt=Requested service name is null
+ServicesMonitor.unknownServiceName.excepton.txt=Requested service name {0} is unknown
\ No newline at end of file
diff --git a/Core/src/org/sleuthkit/autopsy/core/ServicesMonitor.java b/Core/src/org/sleuthkit/autopsy/core/ServicesMonitor.java
index d2e157e9a1..0331107d3a 100644
--- a/Core/src/org/sleuthkit/autopsy/core/ServicesMonitor.java
+++ b/Core/src/org/sleuthkit/autopsy/core/ServicesMonitor.java
@@ -153,14 +153,13 @@ public class ServicesMonitor {
     public String getServiceStatus(String service) throws UnknownServiceException {
 
         if (service == null) {
-            // TODO NbBundle.getMessage(Case.class, "Case.createCaseDir.exception.existNotDir"));
-            throw new UnknownServiceException("Requested service name is null");
+            throw new UnknownServiceException(NbBundle.getMessage(ServicesMonitor.class, "ServicesMonitor.nullServiceName.excepton.txt"));
         }
 
         String status = this.statusByService.get(service);
         if (status == null) {
             // no such service
-            throw new UnknownServiceException("Requested service name " + service + " is unknown");
+            throw new UnknownServiceException(NbBundle.getMessage(ServicesMonitor.class, "ServicesMonitor.unknownServiceName.excepton.txt"));
 
         } else if (status.equals(ServiceStatus.UNKNOWN.toString())) {
             // status for the service is not known. This is likely because we haven't