handle enum value checks
Merge pull request #1585 from marcel-blonk/PLFM-3040

handle enum value checks