Proper Exception handling
Merge origin/master