Fix degraded codes in object-handler