diff --git a/VERSION b/VERSION
index 74d1f38c..9e36f98c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-8.3.5
+8.3.6
diff --git a/calma/CalmaRdpt.c b/calma/CalmaRdpt.c
index e87949e4..03857648 100644
--- a/calma/CalmaRdpt.c
+++ b/calma/CalmaRdpt.c
@@ -98,7 +98,9 @@ calmaInputRescale(n, d)
 	{
 	    /* Scale the GDS planes in this cell's cd_client record */
 	    Plane **gdsplanes = (Plane **)def->cd_client;
-	    CIFScalePlanes(n, d, gdsplanes);
+	    /* Should not happen, but punt if client record is not set */
+	    if (def->cd_client != (ClientData)CLIENTDEFAULT)
+		CIFScalePlanes(n, d, gdsplanes);
 	}
     }