A better exception to fix #101