Revert "Revert my error"

This reverts commit 674e62b61abd6fc30dd4fcb1742c4e415ac87a89.