More robust handling of arguments