2 files changed, 7 insertions, 4 deletions

diff --git a/src/gmrequest.c b/src/gmrequest.c
index 53a3d031..7443c68c 100644
--- a/src/gmrequest.c
+++ b/src/gmrequest.c
@@ -615,10 +615,12 @@ iGmResponse *lockResponse_GmRequest(iGmRequest *d) {
 }
 
 void unlockResponse_GmRequest(iGmRequest *d) {
-    iAssert(d->respLocked);
-    d->respLocked = iFalse;
-    set_Atomic(&d->allowUpdate, iTrue);
-    unlock_Mutex(d->mtx);
+    if (d) {
+        iAssert(d->respLocked);
+        d->respLocked = iFalse;
+        set_Atomic(&d->allowUpdate, iTrue);
+        unlock_Mutex(d->mtx);
+    }
 }
 
 iBool isFinished_GmRequest(const iGmRequest *d) {
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index a843e840..ac07304d 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -1081,6 +1081,7 @@ static void checkResponse_DocumentWidget_(iDocumentWidget *d) {
                         /* Scheme changes must be manually approved. */
                         showErrorPage_DocumentWidget_(d, schemeChangeRedirect_GmStatusCode, dstUrl);
                     }
+                    unlockResponse_GmRequest(d->request);
                     iReleasePtr(&d->request);
                 }
                 break;