Added null check to argument parser