diff --git a/src/commands.c b/src/commands.c
index 511bf51..9d040fa 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -223,9 +223,7 @@ void read_command(xmp_context handle, struct xmp_module_info *mi, struct control
 		ctl->display = cmd;
 		break;
 	case 'c':
-		if (mi->comment != NULL) {
-			ctl->display = cmd;
-		}
+		ctl->display = cmd;
 		break;
 	case '>':
 		change_sequence(handle, mi, ctl, 1);
diff --git a/src/info.c b/src/info.c
index d8e9e3a..62a3b7b 100644
--- a/src/info.c
+++ b/src/info.c
@@ -316,6 +316,11 @@ void info_comment(struct xmp_module_info *mi)
 {
 	char *c = mi->comment;
 
+	if (mi->comment == NULL) {
+		report("No comment.\n");
+		return;
+	}
+
 	while (*c != 0) {
 		report("> ");
 		do {