Index: src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java =================================================================== --- src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (revision 721125) +++ src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (working copy) @@ -1274,6 +1274,8 @@ HRegion region = getRegion(regionName); Map map = region.getFull(row, columnSet, ts, getLockFromId(lockId)); + if (map == null || map.isEmpty()) + return null; HbaseMapWritable result = new HbaseMapWritable(); result.putAll(map);