Everything you added looks good, but it might be nice to check for iterableness on self.object as well.