diff --git a/VERSION b/VERSION
index 58371726..9734220e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-8.3.484
+8.3.485
diff --git a/database/DBcellcopy.c b/database/DBcellcopy.c
index ebfd15dd..d103ce38 100644
--- a/database/DBcellcopy.c
+++ b/database/DBcellcopy.c
@@ -1725,7 +1725,8 @@ DBCellCopyAllCells(scx, xMask, targetUse, pArea)
 
     /* dbCellCopyCellsFunc() allows cells to be left with duplicate IDs */
     /* so generate unique IDs as needed now.				*/
-    DBGenerateUniqueIds(targetUse->cu_def, FALSE);
+
+    if (targetUse != NULL) DBGenerateUniqueIds(targetUse->cu_def, FALSE);
 }
 
 /*
diff --git a/select/selCreate.c b/select/selCreate.c
index dff8707e..a8a3b903 100644
--- a/select/selCreate.c
+++ b/select/selCreate.c
@@ -1247,11 +1247,14 @@ SelectAndCopy2(newSourceDef)
     (void) DBCellCopyAllCells(&scx, CU_DESCEND_SPECIAL, EditCellUse, (Rect *) NULL);
     GeoTransRect(&scx.scx_trans, &scx.scx_area, &editArea);
 
-    DBAdjustLabels(EditCellUse->cu_def, &editArea);
-    DBWAreaChanged(EditCellUse->cu_def, &editArea, DBW_ALLWINDOWS,
-	(TileTypeBitMask *) NULL);
-    DRCCheckThis(EditCellUse->cu_def, TT_CHECKPAINT, &editArea);
-    DBReComputeBbox(EditCellUse->cu_def);
+    if (EditCellUse != NULL)
+    {
+	DBAdjustLabels(EditCellUse->cu_def, &editArea);
+	DBWAreaChanged(EditCellUse->cu_def, &editArea, DBW_ALLWINDOWS,
+			(TileTypeBitMask *) NULL);
+	DRCCheckThis(EditCellUse->cu_def, TT_CHECKPAINT, &editArea);
+	DBReComputeBbox(EditCellUse->cu_def);
+    }
 
     SelectRootDef = newSourceDef;
     SelSetDisplay(SelectUse, SelectRootDef);