Attempted fix for render crash.
Added null checks during container generation.