Merge pull request #11 from fpco/master

Guard against a null list