#2579: Added null check when evaluating lists