Refactor

+Amend exception.