Commit 5074421

@@ -1,21 +1,6 @@
 module Saml
   module Kit
-    class NullAssertion
-      include ActiveModel::Validations
-      include Translatable
-      validate :invalid
-
-      def invalid
-        errors[:assertion].push(error_message(:invalid))
-      end
-
-      def name
-        "NullAssertion"
-      end
-    end
-
     class Assertion
-      NULL=NullAssertion.new
       XPATH=[
         '/samlp:Response/saml:Assertion',
         '/samlp:Response/saml:EncryptedAssertion'

@@ -0,0 +1,17 @@
+module Saml
+  module Kit
+    class NullAssertion
+      include ActiveModel::Validations
+      include Translatable
+      validate :invalid
+
+      def invalid
+        errors[:assertion].push(error_message(:invalid))
+      end
+
+      def name
+        "NullAssertion"
+      end
+    end
+  end
+end

@@ -20,7 +20,7 @@ module Saml
           begin
             node = at_xpath(Saml::Kit::Assertion::XPATH)
             if node.nil?
-              Saml::Kit::Assertion::NULL
+              Saml::Kit::NullAssertion.new
             else
               Saml::Kit::Assertion.new(node, configuration: @configuration, private_keys: private_keys)
             end

@@ -33,6 +33,7 @@ require "saml/kit/default_registry"
 require "saml/kit/logout_response"
 require "saml/kit/logout_request"
 require "saml/kit/metadata"
+require "saml/kit/null_assertion"
 require "saml/kit/composite_metadata"
 require "saml/kit/response"
 require "saml/kit/identity_provider_metadata"