diff --git a/trunk/src/app/srs_app_config.cpp b/trunk/src/app/srs_app_config.cpp
index ff5da2d2e..f3b4bb33a 100644
--- a/trunk/src/app/srs_app_config.cpp
+++ b/trunk/src/app/srs_app_config.cpp
@@ -853,6 +853,7 @@ int SrsConfig::reload_vhost(SrsConfDirective* old_root)
                 }
             }
 
+            // TODO: reload new http_remux in on_vhost_add
             // http_remux, only one per vhost.
             if (get_vhost_http_remux_enabled(vhost)) {
                 for (it = subscribes.begin(); it != subscribes.end(); ++it) {
diff --git a/trunk/src/app/srs_app_http_stream.cpp b/trunk/src/app/srs_app_http_stream.cpp
index cea0138af..8b633d1f2 100644
--- a/trunk/src/app/srs_app_http_stream.cpp
+++ b/trunk/src/app/srs_app_http_stream.cpp
@@ -1228,7 +1228,9 @@ int SrsHttpStreamServer::initialize_flv_streaming()
             continue;
         }
 
-        initialize_flv_entry(conf->arg0());
+        if ((ret = initialize_flv_entry(conf->arg0())) != ERROR_SUCCESS) {
+            return ret;
+        }
     }
     return ret;
 }