rework to use new simplified method and new exception