diff --git a/src/evhelper.cpp b/src/evhelper.cpp
index 422e469..bd57eb2 100644
--- a/src/evhelper.cpp
+++ b/src/evhelper.cpp
@@ -663,4 +663,6 @@ void to_evbuf(evbuffer *buf, const Header& H, bool be)
         throw std::bad_alloc();
 }
 
-}} // namespace pvxs::impl
+} // namespace impl
+
+} // namespace pvxs
diff --git a/src/evhelper.h b/src/evhelper.h
index 6beb0a8..af32e8b 100644
--- a/src/evhelper.h
+++ b/src/evhelper.h
@@ -230,6 +230,9 @@ struct PVXS_API evsocket
     std::vector<SockAddr> interfaces(const SockAddr* match=nullptr);
 };
 
-}} // namespace pvxs::impl
+} // namespace impl
+
+
+} // namespace pvxs
 
 #endif /* EVHELPER_H */
diff --git a/src/serverget.cpp b/src/serverget.cpp
index 5f2409b..8402e52 100644
--- a/src/serverget.cpp
+++ b/src/serverget.cpp
@@ -51,7 +51,9 @@ struct ServerGPR : public ServerOp
                 // noop
 
             } else if(cmd==CMD_GET || (cmd==CMD_PUT && (subcmd&0x40))) {
-                if(!value || Value::Helper::desc(value)!=this->type.get())
+                if(!value)
+                    throw std::logic_error("GET must reply Value");
+                else if(Value::Helper::desc(value)!=this->type.get())
                     throw std::logic_error("GET must reply with exact type previously passed to connect()");
 
             } else if(cmd==CMD_PUT) {