diff --git a/tensorflow/compiler/xla/service/hlo_evaluator.cc b/tensorflow/compiler/xla/service/hlo_evaluator.cc
index 37605366574..d68ecabdbbd 100644
--- a/tensorflow/compiler/xla/service/hlo_evaluator.cc
+++ b/tensorflow/compiler/xla/service/hlo_evaluator.cc
@@ -424,9 +424,10 @@ Status HloEvaluator::HandleParameter(HloInstruction* parameter) {
   const Literal* input_literal = arg_literals_[parameter->parameter_number()];
   VLOG(2) << "Parameter evaluated to: " << input_literal->ToString();
   DCHECK(ShapeUtil::Equal(parameter->shape(), input_literal->shape()))
-      << "parameter shape is: " << ShapeUtil::HumanString(parameter->shape())
+      << "parameter shape is: "
+      << ShapeUtil::HumanStringWithLayout(parameter->shape())
       << ", but input literal shape is: "
-      << ShapeUtil::HumanString(input_literal->shape());
+      << ShapeUtil::HumanStringWithLayout(input_literal->shape());
 #endif
 
   return Status::OK();