Added some guard statements to prevent rare crash in DialogActivity
Updated for release to playstore