EZP-21599: Made sure return is correctly called