Don't crash if ENUM not enabled
Code review feedback
Merge pull request #841 from Metaswitch/issue839

[Reviewer Andy] Don't crash if ENUM not enabled