More fixes for missing images.
Merge pull request #22 from dmwyatt/master

Found some more cases where missing images would raise an error.