still a long exception but reduced unneeded repetition
CE-417 #close fixed