diff --git a/src/jtag/tcl.c b/src/jtag/tcl.c
index 1266cd74e..7307f64e3 100644
--- a/src/jtag/tcl.c
+++ b/src/jtag/tcl.c
@@ -636,9 +636,12 @@ COMMAND_HANDLER(handle_interface_command)
 		if (strcmp(CMD_ARGV[0], jtag_interfaces[i]->name) != 0)
 			continue;
 
-		int retval = jtag_interfaces[i]->register_commands(CMD_CTX);
-		if (ERROR_OK != retval)
+		if (NULL != jtag_interfaces[i]->register_commands)
+		{
+			int retval = jtag_interfaces[i]->register_commands(CMD_CTX);
+			if (ERROR_OK != retval)
 				return retval;
+		}
 
 		jtag_interface = jtag_interfaces[i];