ENH: cover another cornercase + fix messages