More robust handling of unknown commands