Added docs and removed try/catch block