diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
index 68ddfb0..93c3db5 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
@@ -3162,13 +3162,20 @@ public class FSNamesystem implements Namesystem, FSClusterStats,
       penultimateBlockMinReplication = 
         blockManager.checkMinReplication(penultimateBlock);
     }
-    assert penultimateBlockState == BlockUCState.COMPLETE ||
-           penultimateBlockState == BlockUCState.COMMITTED :
-           "Unexpected state of penultimate block in " + src;
+
+    boolean expected=(penultimateBlockState == BlockUCState.COMPLETE ||
+                      penultimateBlockState == BlockUCState.COMMITTED);
+
+    String unexpected_msg = "Unexpected state of penultimate block in " + src;
+    assert expected: unexpected_msg;
+    if (!expected)
+        LOG.error(unexpected_msg);
 
     switch(lastBlockState) {
     case COMPLETE:
-      assert false : "Already checked that the last block is incomplete";
+      String assert_msg = "Already checked that the last block is incomplete" + src;
+      assert false : assert_msg;
+      LOG.error(assert_msg);
       break;
     case COMMITTED:
       // Close file if committed blocks are minimally replicated