ECMS-5185: Skip activity in some unexpected cases