Returning early instead of large conditional block

In response to jessesquires pointers in the pull request issue_213_fix.