Made the try/catches much cleaner