Merge pull request #77 from srawlins/fix-missing-return

Fix missing_return in two spots