diff --git a/src/villas-node.cpp b/src/villas-node.cpp
index da368af89..8f2b3812a 100644
--- a/src/villas-node.cpp
+++ b/src/villas-node.cpp
@@ -174,16 +174,12 @@ int main(int argc, char *argv[])
 	if (ret)
 		throw RuntimeError("Failed to verify configuration");
 
-	ret = sn.start();
-	if (ret)
-		throw RuntimeError("Failed to start super node");
+	sn.start();
 
 	while (!stop)
 		sn.run();
 
-	ret = sn.stop();
-	if (ret)
-		throw RuntimeError("Failed to stop super node");
+	sn.stop();
 
 	logger->info(CLR_GRN("Goodbye!"));