diff --git a/src/dkp-wup.c b/src/dkp-wup.c
index c09e37f..498c6b7 100644
--- a/src/dkp-wup.c
+++ b/src/dkp-wup.c
@@ -274,6 +274,8 @@ dkp_wup_parse_command (DkpWup *wup, const gchar *data)
 	/* replace the first ';' char with a NULL if it exists */
 	length = strlen (packet);
 	for (i=0; i<length; i++) {
+		if (packet[i] < 0x20 && packet[i] > 0x7e)
+			packet[i] = '?';
 		if (packet[i] == ';') {
 			packet[i] = '\0';
 			break;
@@ -326,14 +328,6 @@ dkp_wup_parse_command (DkpWup *wup, const gchar *data)
 		goto out;
 	}
 
-#if 0
-	/* print the data */
-	egg_debug ("command=%c:%c", command, subcommand);
-	for (i=0; i<size; i++) {
-		egg_debug ("%i\t'%s'", i, tokens[i+offset]);
-	}
-#endif
-
 	/* update the command fields */
 	if (command == 'd' && subcommand == '-' && number_tokens - offset == 18) {
 		obj->energy_rate = strtod (tokens[offset+DKP_WUP_RESPONSE_HEADER_WATTS], NULL) / 10.0f;