Added type conditions to die constructor argument assertions