diff --git a/src/parse/language.c b/src/parse/language.c
index 0e4ab7d..16f5d38 100644
--- a/src/parse/language.c
+++ b/src/parse/language.c
@@ -762,9 +762,6 @@ css_error handleEndBlockContent(css_language *c, const parserutils_vector *vecto
 	 * tokens we have left
 	 */
 	ret = handleBlockContent(c, vector);
-	if (ret != CSS_OK) {
-		return ret;
-	}
 
 	/* Our goal here is to ensure that the language parse stack is in the
 	 * right state.  We've encountered the end of a BlockContent such as
@@ -783,7 +780,7 @@ css_error handleEndBlockContent(css_language *c, const parserutils_vector *vecto
 		entry = parserutils_stack_get_current(c->context);
 	}
 
-	return CSS_OK;
+	return ret;
 }
 
 css_error handleDeclaration(css_language *c, const parserutils_vector *vector)
diff --git a/test/data/parse2/dodgy-media-block.dat b/test/data/parse2/dodgy-media-block.dat
index 4b6c220..1022d74 100644
--- a/test/data/parse2/dodgy-media-block.dat
+++ b/test/data/parse2/dodgy-media-block.dat
@@ -7,3 +7,17 @@
 | .outer
 |  top: 0px
 #reset
+
+#data
+@media screen { b; }
+p { padding: 0; }
+#errors
+#expected
+| @media 040
+|  b
+| p
+|  padding-top: 0px
+|  padding-right: 0px
+|  padding-bottom: 0px
+|  padding-left: 0px
+#reset