diff --git a/bsp_q7s/core/CoreController.cpp b/bsp_q7s/core/CoreController.cpp
index 4a9db02a..72171c65 100644
--- a/bsp_q7s/core/CoreController.cpp
+++ b/bsp_q7s/core/CoreController.cpp
@@ -451,7 +451,7 @@ void CoreController::initPrint() {
             TcpTmTcBridge::DEFAULT_SERVER_PORT << std::endl;
 #endif
 
-    if(watchdogFifoFd != 0) {
+    if(watchdogFifoFd > 0) {
         sif::info << "Opened watchdog FIFO successfully.." << std::endl;
     }
 #endif
diff --git a/watchdog/main.cpp b/watchdog/main.cpp
index a1ae3ae8..f297f429 100644
--- a/watchdog/main.cpp
+++ b/watchdog/main.cpp
@@ -14,6 +14,7 @@ int main() {
     }
     catch(const std::runtime_error& e) {
         std::cerr << "eive-watchdog: Run time exception " << e.what() << std::endl;
+        return -1;
     }
     return 0;
 }