diff --git a/src/villas-hook.cpp b/src/villas-hook.cpp
index 3b8f87157..d8dbc0312 100644
--- a/src/villas-hook.cpp
+++ b/src/villas-hook.cpp
@@ -93,6 +93,8 @@ int main(int argc, char *argv[])
 
 	Logger logger = logging.get("hook");
 
+	try {
+
 	struct pool p = { .state = STATE_DESTROYED };
 	struct hook h = { .state = STATE_DESTROYED };
 	struct io  io = { .state = STATE_DESTROYED };
@@ -279,4 +281,9 @@ stop:		sent = io_print(&io, smps, send);
 	logger->info(CLR_GRN("Goodbye!"));
 
 	return 0;
+
+	}
+	catch (std::runtime_error &e) {
+		logger->error("{}", e.what());
+	}
 }
diff --git a/src/villas-node.cpp b/src/villas-node.cpp
index f5e4b17c7..f31b7e621 100644
--- a/src/villas-node.cpp
+++ b/src/villas-node.cpp
@@ -187,7 +187,7 @@ int main(int argc, char *argv[])
 	return 0;
 
 	}
-	catch (RuntimeError &e) {
+	catch (std::runtime_error &e) {
 		logger->error("{}", e.what());
 	}
 }