diff --git a/gcc/fortran/trans-descriptor.cc b/gcc/fortran/trans-descriptor.cc
index 7823f323a177..24a38d26a711 100644
--- a/gcc/fortran/trans-descriptor.cc
+++ b/gcc/fortran/trans-descriptor.cc
@@ -3101,6 +3101,7 @@ gfc_set_descriptor_for_assign_realloc (stmtblock_t *block, gfc_loopinfo *loop,
       tree tmp = gfc_get_dtype_rank_type (expr1->rank, type,
 					  bytes_counted_strides);
       gfc_conv_descriptor_dtype_set (block, desc, tmp);
+      gfc_conv_descriptor_elem_len_set (block, desc, elemsize2);
     }
   else if (expr1->ts.type == BT_CLASS)
     {
diff --git a/gcc/fortran/trans-expr.cc b/gcc/fortran/trans-expr.cc
index 060cf1655c4f..a81156808cab 100644
--- a/gcc/fortran/trans-expr.cc
+++ b/gcc/fortran/trans-expr.cc
@@ -57,7 +57,8 @@ gfc_get_character_len (tree type)
 	      && TYPE_STRING_FLAG (type));
 
   len = TYPE_MAX_VALUE (TYPE_DOMAIN (type));
-  len = (len) ? (len) : (integer_zero_node);
+  if (!len)
+    return NULL_TREE;
   return fold_convert (gfc_charlen_type_node, len);
 }