Worked on ticket 18003, used re-raise instead of raise