Ensure we're always trying to iterate over a list
Merge pull request #164 from Cerberus98/master

Ensure we're always trying to iterate over a list