Added better error checking for feature requests