Fixing assumed Null reference.