Fix empty collections vs null