Merge pull request #1017 from dorkster/fixes

Do NULL-check on Image pointer when caching
Don't use "male01" as default portrait name

Fixes #1018