Prevent explosion if someone passes a list.
Merge bug25401