This should make Airbase a bit more robust

helps handle more inputs