Merge "Verify for type_id out of range errors"