Merge r1906539 from trunk: fail on bad header Submitted By: covener Reviewed By: covener, rpluem, gbechis