Shouldn't need that try/catch block anymore