diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 5dc1dadf104..af5af3e648a 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -147,7 +147,10 @@ Trunk (unreleased changes)
     getDefaultBlockSize() and getDefaultReplication() in WebHdfsFileSystem
     and cleared content type in ExceptionHandler.  (szetszwo)
 
-	HDFS-2481 Unknown protocol: org.apache.hadoop.hdfs.protocol.ClientProtocol (sanjay)
+    HDFS-2481 Unknown protocol: org.apache.hadoop.hdfs.protocol.ClientProtocol.
+    (sanjay)
+
+    HDFS-2497 Fix TestBackupNode failure. (suresh)
 
 Release 0.23.0 - Unreleased
 
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolR23Compatible/NamenodeRegistrationWritable.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolR23Compatible/NamenodeRegistrationWritable.java
index 4ad1c317812..46fe720af7d 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolR23Compatible/NamenodeRegistrationWritable.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocolR23Compatible/NamenodeRegistrationWritable.java
@@ -82,13 +82,13 @@ public class NamenodeRegistrationWritable implements Writable {
     rpcAddress = Text.readString(in);
     httpAddress = Text.readString(in);
     role = NamenodeRole.valueOf(Text.readString(in));
+    storageInfo = new StorageInfoWritable();
     storageInfo.readFields(in);
   }
 
   public static NamenodeRegistrationWritable convert(NamenodeRegistration reg) {
     return new NamenodeRegistrationWritable(reg.getAddress(),
-        reg.getHttpAddress(), reg.getRole(),
-        reg);
+        reg.getHttpAddress(), reg.getRole(), reg);
   }
 
   public NamenodeRegistration convert() {