Merge pull request #26 from ckoehnen-code42/master

Handle gracefully the server returning nil instead of empty collection f...