Address Paul's review feedback
Address Paul's review feedback

Also fix an NPE found by Jenkins

ingted/voltdb,zuowang/voltdb,flybird119/voltdb,migue/voltdb,VoltDB/voltdb,kumarrus/voltdb,deerwalk/voltdb,wolffcm/voltdb,deerwalk/voltdb,flybird119/voltdb,paulmartel/voltdb,simonzhangsm/voltdb,kumarrus/voltdb,ingted/voltdb,simonzhangsm/voltdb,migue/voltdb,deerwalk/voltdb,migue/voltdb,wolffcm/voltdb,flybird119/voltdb,zuowang/voltdb,creative-quant/voltdb,migue/voltdb,creative-quant/voltdb,VoltDB/voltdb,ingted/voltdb,deerwalk/voltdb,creative-quant/voltdb,wolffcm/voltdb,paulmartel/voltdb,zuowang/voltdb,VoltDB/voltdb,kumarrus/voltdb,zuowang/voltdb,flybird119/voltdb,wolffcm/voltdb,VoltDB/voltdb,kumarrus/voltdb,ingted/voltdb,migue/voltdb,deerwalk/voltdb,simonzhangsm/voltdb,flybird119/voltdb,simonzhangsm/voltdb,kumarrus/voltdb,zuowang/voltdb,kumarrus/voltdb,flybird119/voltdb,deerwalk/voltdb,kumarrus/voltdb,creative-quant/voltdb,VoltDB/voltdb,wolffcm/voltdb,paulmartel/voltdb,zuowang/voltdb,simonzhangsm/voltdb,migue/voltdb,zuowang/voltdb,ingted/voltdb,deerwalk/voltdb,ingted/voltdb,migue/voltdb,paulmartel/voltdb,paulmartel/voltdb,flybird119/voltdb,VoltDB/voltdb,simonzhangsm/voltdb,ingted/voltdb,paulmartel/voltdb,creative-quant/voltdb,zuowang/voltdb,simonzhangsm/voltdb,creative-quant/voltdb,ingted/voltdb,flybird119/voltdb,paulmartel/voltdb,wolffcm/voltdb,simonzhangsm/voltdb,migue/voltdb,wolffcm/voltdb,creative-quant/voltdb,paulmartel/voltdb,wolffcm/voltdb,kumarrus/voltdb,creative-quant/voltdb,VoltDB/voltdb,deerwalk/voltdb