Revert "return not found error instead of rasiing useless case clause error"

This reverts commit c331616ad1122ff5fc60793e68a7d5c020aa2f31.