Removed unecessary try/catch stuff