That had actually been my suggestion in the first place; earlier the exception message I suggested used the unit name in the message, so it was used twice.  But now I agree it's not needed more than once.