Removed exception handling so errors bubble up