Added 2 null checks for extraArgs & passedArgs