fixed null argument handling