Merge "Add NPE check when showing error dialog."