might make some errors more obvious. svn: r13141 original commit: bd802748e03c3434195279056f4223b94ddfc48f