diff --git a/CHANGES b/CHANGES
index 38259c6e41..d5197244ac 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 
+2.6-67 | 2019-01-14 14:01:00 -0600
+
+  * GH-161: fix segfault in &default type checking for sets (Jon Siwek, Corelight)
+
 2.6-66 | 2019-01-14 10:26:47 -0600
 
   * Fix performance issue due to variable reuse in table expiration (Justin Azoff, Corelight)
diff --git a/VERSION b/VERSION
index 943a43ab6c..4ed4e6d848 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.6-66
+2.6-67
diff --git a/src/Attr.cc b/src/Attr.cc
index 14b00bd0d7..47ea7d4f06 100644
--- a/src/Attr.cc
+++ b/src/Attr.cc
@@ -292,6 +292,7 @@ void Attributes::CheckAttr(Attr* a)
 				}
 
 			a->AttrExpr()->Error("&default value has inconsistent type", type);
+			return;
 			}
 
 		TableType* tt = type->AsTableType();
diff --git a/testing/btest/Baseline/language.attr-default-global-set-error/out b/testing/btest/Baseline/language.attr-default-global-set-error/out
new file mode 100644
index 0000000000..c784bb683b
--- /dev/null
+++ b/testing/btest/Baseline/language.attr-default-global-set-error/out
@@ -0,0 +1,2 @@
+error in /home/jon/pro/zeek/zeek/testing/btest/.tmp/language.attr-default-global-set-error/attr-default-global-set-error.bro, line 4: arithmetic mixed with non-arithmetic (set[string] and 0)
+error in /home/jon/pro/zeek/zeek/testing/btest/.tmp/language.attr-default-global-set-error/attr-default-global-set-error.bro, line 4: &default value has inconsistent type (0 and set[string])
diff --git a/testing/btest/language/attr-default-global-set-error.bro b/testing/btest/language/attr-default-global-set-error.bro
new file mode 100644
index 0000000000..8ee80bccb2
--- /dev/null
+++ b/testing/btest/language/attr-default-global-set-error.bro
@@ -0,0 +1,4 @@
+# @TEST-EXEC-FAIL: bro -b %INPUT >out 2>&1
+# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff out
+
+global ss: set[string] &default=0;