Take care of various odd exceptions folks have reported.