diff --git a/ENI2/DetailViewControls/WasteDetailControl.xaml.cs b/ENI2/DetailViewControls/WasteDetailControl.xaml.cs
index 69c456be..861b0782 100644
--- a/ENI2/DetailViewControls/WasteDetailControl.xaml.cs
+++ b/ENI2/DetailViewControls/WasteDetailControl.xaml.cs
@@ -311,6 +311,7 @@ namespace ENI2.DetailViewControls
 
         private void DataGridWasteReceived_CreateRequested()
         {
+            if (_selectedWAS_RCPT == null) return;
             EditWasteReceivedDialog ewrd = new EditWasteReceivedDialog();
             ewrd.WasteReceived = new WasteReceived();
             ewrd.WasteReceived.WAS_RCPT = _selectedWAS_RCPT;