Added throw_null_command_error