diff --git a/lustre/ptlrpc/client.c b/lustre/ptlrpc/client.c
index ebf03fc9da24dac5836a08ce70df97382f3a5a18..4fd69e91abd4447b383b29750f070c62e0724140 100644
--- a/lustre/ptlrpc/client.c
+++ b/lustre/ptlrpc/client.c
@@ -608,13 +608,12 @@ static int ptlrpc_check_status(struct ptlrpc_request *req)
 
         err = lustre_msg_get_status(req->rq_repmsg);
         if (lustre_msg_get_type(req->rq_repmsg) == PTL_RPC_MSG_ERR) {
-                LCONSOLE_ERROR_MSG(0x011, "an error ocurred while communicating"
-                                   " with %s The %s operation failed with %d",
-                                   req->rq_export ? 
-                                        obd_export_nid2str(req->rq_export)
-                                        : "(no nid)",
-                                   ll_opcode2str(lustre_msg_get_opc(req->rq_reqmsg)),
-                                   err);
+                struct obd_import *imp = req->rq_import;
+                __u32 opc = lustre_msg_get_opc(req->rq_reqmsg);
+                LCONSOLE_ERROR_MSG(0x011,"an error occurred while communicating"
+                                " with %s. The %s operation failed with %d\n",
+                                libcfs_nid2str(imp->imp_connection->c_peer.nid),
+                                ll_opcode2str(opc), err);
                 RETURN(err < 0 ? err : -EINVAL);
         }