add 2 exception handling, one using annotation and another in configuration.
Merge remote-tracking branch 'aaa/master'