[AI-492] Fixed problems with constraint violation handling