JAL-1476 JAL-1016 avoid NPE messiness if structures fail to align for some reason