Make diff output a little bit more error robust