put exceptions caught here in the WARN state
Merge remote-tracking branch 'origin/master'