diff --git a/Code/Mantid/Framework/API/src/RemoteJobManagerFactory.cpp b/Code/Mantid/Framework/API/src/RemoteJobManagerFactory.cpp
index c5878e6294655699a0370035d89b47016f344e57..6d883972aa87b8602cac98dbfbb0431184d5441a 100644
--- a/Code/Mantid/Framework/API/src/RemoteJobManagerFactory.cpp
+++ b/Code/Mantid/Framework/API/src/RemoteJobManagerFactory.cpp
@@ -73,10 +73,12 @@ RemoteJobManagerFactoryImpl::create(const std::string baseURL,
   try {
     jm = this->create(jobManagerType);
   } catch (Kernel::Exception::NotFoundError &e) {
-    throw std::runtime_error(
-        "Failed to create a remote job manager of type (class) '" +
-        jobManagerType + "' with base URL " + baseURL +
-        ". Error description: " + e.what());
+    throw Kernel::Exception::NotFoundError(
+        "RemoteJobManagerFactory: failed to create a remote job manager of "
+        "type (class) '" +
+            jobManagerType + "' with base URL " + baseURL +
+            ". Error description: " + e.what(),
+        jobManagerType);
   }
 
   return jm;
diff --git a/Code/Mantid/Framework/API/test/RemoteJobManagerFactoryTest.h b/Code/Mantid/Framework/API/test/RemoteJobManagerFactoryTest.h
index fb187266e24fde1906c02f8a80fbc49000062f75..83f31be0bbc63313c1ee935614dfc0b5027cbbdc 100644
--- a/Code/Mantid/Framework/API/test/RemoteJobManagerFactoryTest.h
+++ b/Code/Mantid/Framework/API/test/RemoteJobManagerFactoryTest.h
@@ -87,9 +87,11 @@ public:
   // minimal positive test
   void test_createTestJM() {
     RemoteJobManagerFactory::Instance().subscribe<TestJM>("TestJM");
-    TS_ASSERT_THROWS_NOTHING(
+    // throws not found cause it is not in facilities.xml, but otherwise fine
+    TS_ASSERT_THROWS(
         Mantid::Kernel::IRemoteJobManager_sptr jobManager =
-            Mantid::API::RemoteJobManagerFactory::Instance().create("TestJM"));
+            Mantid::API::RemoteJobManagerFactory::Instance().create("TestJM"),
+        Mantid::Kernel::Exception::NotFoundError);
   }
 
   // this must fail, resource not found in the current facility
@@ -99,15 +101,17 @@ public:
         Mantid::Kernel::ConfigService::Instance().getFacility();
 
     Mantid::Kernel::ConfigService::Instance().setFacility("ISIS");
-    TS_ASSERT_THROWS_NOTHING(
+    TS_ASSERT_THROWS(
         Mantid::Kernel::IRemoteJobManager_sptr jobManager =
-            Mantid::API::RemoteJobManagerFactory::Instance().create("Fermi"));
+            Mantid::API::RemoteJobManagerFactory::Instance().create("Fermi"),
+        Mantid::Kernel::Exception::NotFoundError);
 
     Mantid::Kernel::ConfigService::Instance().setFacility("SNS");
-    TS_ASSERT_THROWS_NOTHING(
+    TS_ASSERT_THROWS(
         Mantid::Kernel::IRemoteJobManager_sptr jobManager =
             Mantid::API::RemoteJobManagerFactory::Instance().create(
-                "SCARF@LSF"));
+                "SCARF@STFC"),
+        Mantid::Kernel::Exception::NotFoundError);
 
     // restore facility, always do this at the end
     Mantid::Kernel::ConfigService::Instance().setFacility(prevFac.name());
@@ -120,15 +124,21 @@ public:
         Mantid::Kernel::ConfigService::Instance().getFacility();
 
     Mantid::Kernel::ConfigService::Instance().setFacility("SNS");
-    TS_ASSERT_THROWS_NOTHING(
+    // TODO: at the moemnt these two create throw a NotFoundError
+    // because the RemoteJobManager classes are missing and have not
+    // done a DECLARE_REMOTEJOBMANAGER. Change this test when that is
+    // done (ticket #11126 etc.)
+    TS_ASSERT_THROWS(
         Mantid::Kernel::IRemoteJobManager_sptr jobManager =
-            Mantid::API::RemoteJobManagerFactory::Instance().create("Fermi"));
+            Mantid::API::RemoteJobManagerFactory::Instance().create("Fermi"),
+        Mantid::Kernel::Exception::NotFoundError);
 
     Mantid::Kernel::ConfigService::Instance().setFacility("ISIS");
-    TS_ASSERT_THROWS_NOTHING(
+    TS_ASSERT_THROWS(
         Mantid::Kernel::IRemoteJobManager_sptr jobManager =
             Mantid::API::RemoteJobManagerFactory::Instance().create(
-                "SCARF@LSF"));
+                "SCARF@STFC"),
+        Mantid::Kernel::Exception::NotFoundError);
 
     // restore facility, always do this at the end
     Mantid::Kernel::ConfigService::Instance().setFacility(prevFac.name());