removed a few more try catches