Index: serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/objectinspector/LazyBinaryMapObjectInspector.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/objectinspector/LazyBinaryMapObjectInspector.java (revision 1564596) +++ serde/src/java/org/apache/hadoop/hive/serde2/lazybinary/objectinspector/LazyBinaryMapObjectInspector.java (revision ) @@ -56,8 +56,8 @@ @Override public Object getMapValueElement(Object data, Object key) { - if (data == null) { - return -1; + if (data == null || key == null) { + return null; } return ((LazyBinaryMap) data).getMapValueElement(key); }