Merge "FIX Null Pointer Exception on dialog cancel"