added check for argument existence