Runtime fix (Gateway.dm, pick from empty list)