mod: extra check - to avoid access to empty container