diff --git a/GNUmakefile b/GNUmakefile
index e4c9a07..8548901 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -23,8 +23,8 @@ OBJDIR	:= obj$(OBJSUFFIX)
 
 TOP	:= $(shell echo $${PWD-`pwd`})
 GTEST_DIR ?= $(TOP)/gtest
-ZOOKEEPER_LIB := /usr/local/lib/libzookeeper_mt.a
-ZOOKEEPER_DIR := /usr/local/zookeeper-3.4.5
+ZOOKEEPER_LIB ?= /usr/local/lib/libzookeeper_mt.a
+ZOOKEEPER_DIR ?= /usr/local/zookeeper-3.4.5
 
 ifeq ($(DEBUG),yes)
 BASECFLAGS := -g
@@ -103,12 +103,12 @@ endif
 CFLAGS_BASE := $(COMFLAGS) -std=gnu0x $(INCLUDES)
 CFLAGS_SILENT := $(CFLAGS_BASE)
 CFLAGS_NOWERROR := $(CFLAGS_BASE) $(CWARNS)
-CFLAGS := $(CFLAGS_BASE) -Werror $(CWARNS)
+CFLAGS := $(CFLAGS_BASE) $(CWARNS)
 
 CXXFLAGS_BASE := $(COMFLAGS) -std=c++0x $(INCLUDES)
 CXXFLAGS_SILENT := $(CXXFLAGS_BASE) $(EXTRACXXFLAGS)
 CXXFLAGS_NOWERROR := $(CXXFLAGS_BASE) $(CXXWARNS) $(EXTRACXXFLAGS)
-CXXFLAGS := $(CXXFLAGS_BASE) -Werror $(CXXWARNS) $(EXTRACXXFLAGS)
+CXXFLAGS := $(CXXFLAGS_BASE) $(CXXWARNS) $(EXTRACXXFLAGS)
 
 ifeq ($(COMPILER),intel)
 CXXFLAGS = $(CXXFLAGS_BASE) $(CXXWARNS)
diff --git a/src/MasterService.cc b/src/MasterService.cc
index 93cfb5d..02876c7 100644
--- a/src/MasterService.cc
+++ b/src/MasterService.cc
@@ -613,7 +613,7 @@ MasterService::multiWrite(const WireFormat::MultiOp::Request* reqHdr,
             reqOffset, currentReq->valueLength);
         reqOffset += currentReq->valueLength;
 
-        if (stringKey == NULL || value == NULL) {
+        if (stringKey == NULL) {
             respHdr->common.status = STATUS_REQUEST_FORMAT_ERROR;
             break;
         }