diff --git a/modules/http2/h2_mplx.c b/modules/http2/h2_mplx.c
index 8053f60c9a2..16e528de957 100644
--- a/modules/http2/h2_mplx.c
+++ b/modules/http2/h2_mplx.c
@@ -603,7 +603,8 @@ const h2_stream *h2_mplx_c2_stream_get(h2_mplx *m, int stream_id)
     h2_stream *s = NULL;
     
     H2_MPLX_ENTER_ALWAYS(m);
-    s = h2_ihash_get(m->streams, stream_id);
+    if (m->streams)
+        s = h2_ihash_get(m->streams, stream_id);
     H2_MPLX_LEAVE(m);
 
     return s;
diff --git a/modules/http2/h2_stream.c b/modules/http2/h2_stream.c
index f0e671ca5d6..3cec981a054 100644
--- a/modules/http2/h2_stream.c
+++ b/modules/http2/h2_stream.c
@@ -659,7 +659,7 @@ apr_status_t h2_stream_set_request_rec(h2_stream *stream,
     if (stream->rst_error) {
         return APR_ECONNRESET;
     }
-    status = h2_request_rcreate(&req, stream->pool, r,
+    status = h2_request_rcreate(&req, r->pool, r,
                                 &stream->session->hd_scratch);
     if (status == APR_SUCCESS) {
         ap_log_rerror(APLOG_MARK, APLOG_DEBUG, status, r,