diff --git a/lib/IdPAccountManager/WebRequest.pm b/lib/IdPAccountManager/WebRequest.pm
index 5665ee51039bb188575799563ac44539a0f305ea..f9060691f01a7aca37438f606dcc6335edc0ca6e 100755
--- a/lib/IdPAccountManager/WebRequest.pm
+++ b/lib/IdPAccountManager/WebRequest.pm
@@ -201,12 +201,11 @@ sub respond {
 sub req_account_wizard {
     my ($self) = @_;
 
-    my $federation_metadata = IdPAccountManager::SAMLMetadata->new();
+    my $metadata;
 
     eval {
-        $federation_metadata->load(
-            federation_metadata_file_path =>
-              $self->{configuration}->{federation_metadata_file_path}
+        $metadata = IdPAccountManager::SAMLMetadata->new(
+            file => $self->{configuration}->{federation_metadata_file_path}
         );
     };
     if ($EVAL_ERROR) {
@@ -215,14 +214,7 @@ sub req_account_wizard {
         return undef;
     }
 
-    eval {
-        $self->{out} = $federation_metadata->parse();
-    };
-    if ($EVAL_ERROR) {
-        push @{ $self->{out}->{errors} }, "internal";
-        $self->{logger}->error("Failed to parse federation metadata: $EVAL_ERROR");
-        return undef;
-    }
+    $self->{out} = $metadata->parse();
 
     $self->{out}->{subtitle} = 'Select your Service Provider';