diff --git a/record/record.c b/record/record.c
index 6c28bb228..a345798bb 100644
--- a/record/record.c
+++ b/record/record.c
@@ -888,7 +888,8 @@ RecordInstallHooks(RecordClientsAndProtocolPtr pRCAP, XID oneclient)
                     unsigned int j;
 
                     for (j = interval.first; j <= interval.last; j++)
-                        pClient->requestVector[j] = RecordARequest;
+                        if (pClient)
+                            pClient->requestVector[j] = RecordARequest;
                 }
             }
         }
diff --git a/record/set.c b/record/set.c
index f071a4b3f..e623b7c69 100644
--- a/record/set.c
+++ b/record/set.c
@@ -361,7 +361,8 @@ IntervalListCreateSet(RecordSetInterval * pIntervals, int nIntervals,
             goto bailout;
         prls->baseSet.ops = &IntervalListSetOperations;
     }
-    memcpy(&prls[1], stackIntervals, nIntervals * sizeof(RecordSetInterval));
+    if (stackIntervals)
+        memcpy(&prls[1], stackIntervals, nIntervals * sizeof(RecordSetInterval));
     prls->nIntervals = nIntervals;
  bailout:
     free(stackIntervals);