EZP-21766: Added missing breaks