Putting back some null checks in the dialog fragments.  Thanks, monkey