Add duplicate/empty exception differentiation