Throwing better exception when method is not supported. Removed TODO