diff --git a/cde/programs/dtcm/dtcm/props_pu.c b/cde/programs/dtcm/dtcm/props_pu.c
index b3b0f5cff..999d1a5b3 100644
--- a/cde/programs/dtcm/dtcm/props_pu.c
+++ b/cde/programs/dtcm/dtcm/props_pu.c
@@ -2136,7 +2136,7 @@ p_save_changes(Calendar *c) {
 
         if (redisplay_mask & PROPS_REDO_EDITORS) {
 
-		if (((Editor *) c->editor)->base_form_mgr) {
+		if (c->editor && ((Editor *) c->editor)->base_form_mgr) {
 
 			Editor *e = (Editor *) c->editor;
 			DSSW *dssw = &((Editor *) c->editor)->dssw;