Changed error message for invalid `@choice` parameter to include list of valid choices