throw an exception on notice/error
Merge remote-tracking branch 'origin/master'