Fix for previous commit

Seems python doesn't like empty indented code blocks, so removed the
else and elif.
Changed the way an unknown method is checked for.