Making sure all paths return something

Callers may rely on being able to iterate over the result of this function.
Merge pull request #20 from jhorneman/master

Making sure all paths return something