make sure alert handler is not null
Merge branch 'feature_ui_stability'