Modified error/warning output