diff --git a/libmpdemux/network.c b/libmpdemux/network.c
index 0abb5ddb1e..63a726ea2c 100644
--- a/libmpdemux/network.c
+++ b/libmpdemux/network.c
@@ -451,10 +451,9 @@ nop_streaming_start( stream_t *stream ) {
 				fd = -1;
 		}
 		stream->fd = fd;
+		http_free( http_hdr );
 	}
 
-	http_free( http_hdr );
-
 	stream->streaming_ctrl->streaming_read = nop_streaming_read;
 	stream->streaming_ctrl->streaming_seek = nop_streaming_seek;
 	stream->streaming_ctrl->prebuffer_size = 180000;
@@ -543,7 +542,7 @@ rtp_streaming_start( stream_t *stream ) {
 	streaming_ctrl_t *streaming_ctrl;
 	int fd;
 
-	if( streaming_ctrl==NULL ) return -1;
+	if( stream==NULL ) return -1;
 	streaming_ctrl = stream->streaming_ctrl;
 	fd = stream->fd;