diff --git a/src/webu_stream.cpp b/src/webu_stream.cpp
index 4ac40c1e..277e7281 100644
--- a/src/webu_stream.cpp
+++ b/src/webu_stream.cpp
@@ -661,15 +661,14 @@ mhdrslt cls_webu_stream::stream_static()
 }
 
 /* Entry point for answering stream*/
-mhdrslt cls_webu_stream::main()
+void cls_webu_stream::main()
 {
-    mhdrslt retcd;
+    mhdrslt retcd = MHD_NO;
 
     if (valid_request() == false) {
         webua->bad_request();
-        return MHD_NO;
+        return;
     }
-
     set_cnct_type();
 
     if (webua->uri_cmd1 == "static") {
@@ -703,13 +702,12 @@ mhdrslt cls_webu_stream::main()
         if (retcd == MHD_NO) {
             mydelete(webu_mpegts);
         }
-
-    } else {
-        webua->bad_request();
-        retcd = MHD_NO;
     }
 
-    return retcd;
+    if (retcd == MHD_NO) {
+        webua->bad_request();
+    }
+
 }
 
 cls_webu_stream::cls_webu_stream(cls_webu_ans *p_webua)
diff --git a/src/webu_stream.hpp b/src/webu_stream.hpp
index f5679727..2f339887 100644
--- a/src/webu_stream.hpp
+++ b/src/webu_stream.hpp
@@ -28,7 +28,7 @@
             size_t  resp_used;      /* The amount of the response page used */
             u_char  *resp_image;    /* Response image to provide to user */
 
-            mhdrslt main();
+            void main();
             ssize_t mjpeg_response (char *buf, size_t max);
             bool check_finish();
             void delay();