diff --git a/EnvelopeGenerator.Form/Controllers/BaseController.vb b/EnvelopeGenerator.Form/Controllers/BaseController.vb
index 267b065b..a4c4abea 100644
--- a/EnvelopeGenerator.Form/Controllers/BaseController.vb
+++ b/EnvelopeGenerator.Form/Controllers/BaseController.vb
@@ -128,9 +128,14 @@ Public MustInherit Class BaseController
     End Function
 
     Public Function DeleteDocumentsFromDisk(pEnvelope As Envelope) As Boolean
-        Return pEnvelope.Documents.
-            Select(Function(d) DeleteDocumentFromDisk(d)).
-            All(Function(r) r = True)
+        If Not IsNothing(pEnvelope.Documents) Then
+            Return pEnvelope.Documents.
+          Select(Function(d) DeleteDocumentFromDisk(d)).
+          All(Function(r) r = True)
+        Else
+            Return True
+        End If
+
     End Function
 
     Public Function DeleteDocumentFromDisk(pDocument As EnvelopeDocument) As Boolean