diff --git a/src/zm_stream.cpp b/src/zm_stream.cpp
index 1f141ec65..e309a14bc 100644
--- a/src/zm_stream.cpp
+++ b/src/zm_stream.cpp
@@ -40,7 +40,7 @@ StreamBase::~StreamBase() {
 bool StreamBase::loadMonitor(int p_monitor_id) {
   monitor_id = p_monitor_id;
 
-  if ( !(monitor = Monitor::Load(monitor_id, false, Monitor::QUERY)) ) {
+  if ( !(monitor or (monitor = Monitor::Load(monitor_id, false, Monitor::QUERY))) ) {
     Error("Unable to load monitor id %d for streaming", monitor_id);
     return false;
   }
@@ -52,6 +52,7 @@ bool StreamBase::loadMonitor(int p_monitor_id) {
 
   if ( !monitor->connect() ) {
     Error("Unable to connect to monitor id %d for streaming", monitor_id);
+    monitor->disconnect();
     return false;
   }