Followup r101449, bit better message output