Partial fix for nulls during thumbnail caching.