Add an extra check to prevent 2.3 controller handling error