Added exeption
Merge branch 'master' of https://github.com/Leroygirl/sibriver_test