address_handler: try to be smarter about what commands are valid
address_handler: try to be smarter about what commands are valid