More improvements to fail() messages (add primary error msg)