changed exception type + unit tests pass now