fixed corner case, more verbose messages