Removed catching and re-throwing of exceptions.