Revert "Revert "Simple exception""

This reverts commit 2cb82701c384dc5117fb473db8ac5dce6b6345f6.