alert to custom alert, error message handler
Merge remote-tracking branch 'origin/master'