Added error catcher
Build