Merge "Remove unnecessary try-catch. OF codes are no longer in an enum."