diff --git a/utils/misc/src/main/java/org/onlab/packet/ICMP6.java b/utils/misc/src/main/java/org/onlab/packet/ICMP6.java
index 13deab2..bb4f204 100644
--- a/utils/misc/src/main/java/org/onlab/packet/ICMP6.java
+++ b/utils/misc/src/main/java/org/onlab/packet/ICMP6.java
@@ -121,7 +121,10 @@
             payloadData = this.payload.serialize();
         }
 
-        int payloadLength = payloadData == null ? 0 : (short) payloadData.length;
+        int payloadLength = 0;
+        if (payloadData != null) {
+            payloadLength = payloadData.length;
+        }
 
         final byte[] data = new byte[HEADER_LENGTH + payloadLength];
         final ByteBuffer bb = ByteBuffer.wrap(data);