Merge "Check for subId array being null."