Revert "Simple exception"

This reverts commit 448560e9782a7a7b2c962963e11f3b177f3035ee.