diff --git a/Sources/FilterTag.swift b/Sources/FilterTag.swift
index 27fae15..63ce321 100644
--- a/Sources/FilterTag.swift
+++ b/Sources/FilterTag.swift
@@ -11,7 +11,7 @@ class FilterNode : NodeType {
 
     let blocks = try parser.parse(until(["endfilter"]))
 
-    guard let token = parser.nextToken() else {
+    guard parser.nextToken() != nil else {
       throw TemplateSyntaxError("`endfilter` was not found.")
     }
 
diff --git a/Sources/Template.swift b/Sources/Template.swift
index c28fe99..5decb84 100644
--- a/Sources/Template.swift
+++ b/Sources/Template.swift
@@ -64,7 +64,7 @@ public class Template: ExpressibleByStringLiteral {
 
   /// Render the given template with a context
   func render(_ context: Context) throws -> String {
-    let context = context ?? Context(environment: environment)
+    let context = context
     let parser = TokenParser(tokens: tokens, namespace: context.namespace)
     let nodes = try parser.parse()
     return try renderNodes(nodes, context)