Added check for feature support.
Changed error message
Typo fix