diff --git a/src/emitterstate.cpp b/src/emitterstate.cpp
index 9642179..4e1ae64 100644
--- a/src/emitterstate.cpp
+++ b/src/emitterstate.cpp
@@ -155,8 +155,12 @@ namespace YAML
 	
 	void EmitterState::EndedGroup(GroupType::value type)
 	{
-		if(m_groups.empty())
-			return SetError(ErrorMsg::UNMATCHED_GROUP_TAG);
+		if(m_groups.empty()) {
+            if(type == GroupType::Seq)
+                return SetError(ErrorMsg::UNEXPECTED_END_SEQ);
+            else
+                return SetError(ErrorMsg::UNEXPECTED_END_MAP);
+        }
 		
 		// get rid of the current group
 		{