Adding dry run... fixing NPE