Fix: Be more robust if OS ports do not exist in the model
2 files changed