diff --git a/cde/programs/dtpdmd/dtpdmd.c b/cde/programs/dtpdmd/dtpdmd.c
index e47794403..68b5dd0a0 100644
--- a/cde/programs/dtpdmd/dtpdmd.c
+++ b/cde/programs/dtpdmd/dtpdmd.c
@@ -162,6 +162,8 @@ static int generic_error_handler( edpy, eevent )
     g.xerrno  = eevent->error_code;
     g.xerrreq = eevent->request_code;
     g.xerrmin = eevent->minor_code;
+
+    return 0; /* XSetErrorHandler handlers return values are ignored */
 }
 
 /******************************************************************************
diff --git a/cde/programs/dtpdmd/manager.c b/cde/programs/dtpdmd/manager.c
index b0f058641..1c60e0af3 100644
--- a/cde/programs/dtpdmd/manager.c
+++ b/cde/programs/dtpdmd/manager.c
@@ -475,7 +475,7 @@ void mgr_launch_pdm( XpPdmServiceRec *rec )
 	/*
 	 * Set XAUTHORITY env var if needed.
 	 */
-	if ((rec->cookie_cnt) && (rec->auth_filename) && (rec->auth_file)) {
+	if ((rec->cookie_cnt) && (rec->auth_file)) {
 	    envstr = Xmalloc( strlen(rec->auth_filename) + 12 );
 	    sprintf( envstr, "XAUTHORITY=%s", rec->auth_filename );
 	    putenv( envstr );
@@ -513,7 +513,7 @@ void mgr_launch_pdm( XpPdmServiceRec *rec )
  */
 void mgr_fetch_pdm( XpPdmServiceRec *rec )
 {
-    char tstr[1024], *tptr1, *tptr2, *tptr3;
+    char tstr[1024], *tptr1 = NULL, *tptr2, *tptr3;
     int  firstTime;
     long now;
     Display *tdpy;