More edge case handling on missing fields