diff --git a/tapeserver/cta-tapedSystemtests.cpp b/tapeserver/cta-tapedSystemtests.cpp
index dc14d5f5676aa9f35dfa6da492e85b83ce7d9f7e..9cb9c1ea83bfc5befd2d341ff3b9e9da0c39c88e 100644
--- a/tapeserver/cta-tapedSystemtests.cpp
+++ b/tapeserver/cta-tapedSystemtests.cpp
@@ -58,7 +58,8 @@ TEST(cta_taped, InvocationTests) {
     ctaConf.stringAppend(tpConfig.path());
     cta::threading::SubProcess spNoDrive("cta-taped", std::list<std::string>({"cta-taped", "-f", "-s", "-c", ctaConf.path()}));
     spNoDrive.wait();
-    ASSERT_NE(std::string::npos, spNoDrive.stdout().find("MSG=\"Aborting cta-taped on uncaught exception. Stack trace follows.\" Message=\"No drive found in configuration\""));
+    ASSERT_NE(std::string::npos, spNoDrive.stdout().find("MSG=\"Aborting cta-taped. Not starting because: "
+      "No drive found in configuration\""));
     ASSERT_TRUE(spNoDrive.stderr().empty());
     ASSERT_EQ(EXIT_FAILURE, spNoDrive.exitValue());
   }
diff --git a/tapeserver/daemon/TapeDaemon.cpp b/tapeserver/daemon/TapeDaemon.cpp
index 0f1e08eda6920224c6b30b00fc48d0ff2f4b39d6..f715606f05ce944c4487a967ad428997b8e4331f 100644
--- a/tapeserver/daemon/TapeDaemon.cpp
+++ b/tapeserver/daemon/TapeDaemon.cpp
@@ -53,7 +53,7 @@ int TapeDaemon::main() {
     exceptionThrowingMain();
   } catch (cta::exception::NoSuchObject &ex) {
     m_log(log::ERR, "Aborting cta-taped. Not starting because: " + ex.getMessage().str());
-    return 2;
+    return 1;
   } catch (cta::exception::Exception &ex) {
     // Log the error
     m_log(log::ERR, "Aborting cta-taped on uncaught exception. Stack trace follows.", {{"Message", ex.getMessage().str()}});