1 files changed, 12 insertions, 8 deletions
diff --git a/src/libutil/json.cc b/src/libutil/json.cc
index b8b8ef9c8cca..813b257016e4 100644
--- a/src/libutil/json.cc
+++ b/src/libutil/json.cc
@@ -50,20 +50,22 @@ template<> void toJSON<std::nullptr_t>(std::ostream & str, const std::nullptr_t
 JSONWriter::JSONWriter(std::ostream & str, bool indent)
     : state(new JSONState(str, indent))
 {
-    state->stack.push_back(this);
+    state->stack++;
 }
 
 JSONWriter::JSONWriter(JSONState * state)
     : state(state)
 {
-    state->stack.push_back(this);
+    state->stack++;
 }
 
 JSONWriter::~JSONWriter()
 {
-    assertActive();
-    state->stack.pop_back();
-    if (state->stack.empty()) delete state;
+    if (state) {
+        assertActive();
+        state->stack--;
+        if (state->stack == 0) delete state;
+    }
 }
 
 void JSONWriter::comma()
@@ -121,9 +123,11 @@ void JSONObject::open()
 
 JSONObject::~JSONObject()
 {
-    state->depth--;
-    if (state->indent && !first) indent();
-    state->str << "}";
+    if (state) {
+        state->depth--;
+        if (state->indent && !first) indent();
+        state->str << "}";
+    }
 }
 
 void JSONObject::attr(const std::string & s)