Added fix for NPE in ChooseActivityDialog