Issue #1 Should prevent fatal errors when nothing returned.
Merge branch 'master' of https://github.com/e107inc/sfs