diff --git a/src/target/arm11.c b/src/target/arm11.c
index 750c1f590..4d9016fdc 100644
--- a/src/target/arm11.c
+++ b/src/target/arm11.c
@@ -2138,6 +2138,8 @@ static int arm11_register_commands(struct command_context *cmd_ctx)
 
 	struct command *top_cmd, *mw_cmd;
 
+	armv4_5_register_commands(cmd_ctx);
+
 	top_cmd = register_command(cmd_ctx, NULL, "arm11",
 			NULL, COMMAND_ANY, NULL);
 
diff --git a/src/target/armv4_5.c b/src/target/armv4_5.c
index 7c4861fff..b60b8b275 100644
--- a/src/target/armv4_5.c
+++ b/src/target/armv4_5.c
@@ -378,6 +378,12 @@ COMMAND_HANDLER(handle_armv4_5_reg_command)
 	if (armv4_5_mode_to_number(armv4_5->core_mode)==-1)
 		return ERROR_FAIL;
 
+	if (!armv4_5->full_context) {
+		command_print(cmd_ctx, "error: target doesn't support %s",
+				CMD_NAME);
+		return ERROR_FAIL;
+	}
+
 	for (num = 0; num <= 15; num++)
 	{
 		output_len = 0;
@@ -522,7 +528,8 @@ int armv4_5_register_commands(struct command_context *cmd_ctx)
 			"display/change ARM core state <arm | thumb>");
 	register_command(cmd_ctx, armv4_5_cmd, "disassemble",
 			handle_armv4_5_disassemble_command, COMMAND_EXEC,
-			"disassemble instructions <address> [<count> ['thumb']]");
+			"disassemble instructions "
+				"<address> [<count> ['thumb']]");
 
 	return ERROR_OK;
 }