Added throw exception to all methods