diff --git a/database/DBcellname.c b/database/DBcellname.c
index b554b5af..4f56a190 100644
--- a/database/DBcellname.c
+++ b/database/DBcellname.c
@@ -1700,7 +1700,7 @@ DBCellNewDef(cellName)
 	cellName = UNNAMED;
 
     entry = HashFind(&dbCellDefTable, cellName);
-    if (HashGetValue(entry) != (ClientData) NULL)
+    if (HashGetValue(entry) != NULL)
 	return ((CellDef *) NULL);
 
     cellDef = DBCellDefAlloc();
@@ -1861,7 +1861,7 @@ DBCellRenameDef(cellDef, newName)
     ASSERT(HashGetValue(oldEntry) == (ClientData) cellDef, "DBCellRenameDef");
 
     newEntry = HashFind(&dbCellDefTable, newName);
-    if (HashGetValue(newEntry) != (ClientData) NULL)
+    if (HashGetValue(newEntry) != NULL)
 	return (FALSE);
 
     HashSetValue(oldEntry, (ClientData) NULL);