Improve Exception handling / error returning