fixed namespace for exceptions
merged master into jrouge/WFU-2725/Airbrake_episode_6
merged master into jrouge/WFU-2725/Airbrake_episode_6