diff --git a/C4/Context.pm b/C4/Context.pm
index 1af323f4a2..b8f9117dbd 100644
--- a/C4/Context.pm
+++ b/C4/Context.pm
@@ -562,7 +562,8 @@ sub _new_Zconn {
     $syntax = 'xml';
     $elementSetName = 'marcxml';
 
-    my $host = _common_config($server, 'listen')->{content};
+    my $host = _common_config( $server, 'listen' );
+    $host = $host->{content};
     my $serverinfo = _common_config($server, 'serverinfo');
     my $user = $serverinfo->{user};
     my $password = $serverinfo->{password};
@@ -572,7 +573,8 @@ sub _new_Zconn {
         $o->option(user => $user) if $user && $password;
         $o->option(password => $password) if $user && $password;
         $o->option(async => 1) if $async;
-        $o->option(cqlfile=> _common_config($server, 'server')->{cql2rpn});
+        my $server_conf = _common_config( $server, 'server' );
+        $o->option( cqlfile => $server_conf->{cql2rpn} );
         $o->option(cclfile=> $serverinfo->{ccl2rpn});
         $o->option(preferredRecordSyntax => $syntax);
         $o->option(elementSetName => $elementSetName) if $elementSetName;