Added additional array key checks.
Issue: aar/OASIS#576 aar/OASIS#577