diff --git a/opac/opac-memberentry.pl b/opac/opac-memberentry.pl
index 1874116913..7dfcda37fc 100755
--- a/opac/opac-memberentry.pl
+++ b/opac/opac-memberentry.pl
@@ -330,12 +330,14 @@ elsif ( $action eq 'edit' ) {    #Display logged in borrower's data
 
 my $captcha = random_string("CCCCC");
 my $patron_param = scalar Koha::Patrons->find( $borrowernumber );
+$template->param(
+    has_guarantor_flag => $patron_param->guarantor_relationships->guarantors->_resultset->count
+) if $patron_param;
 
 $template->param(
     captcha        => $captcha,
     captcha_digest => md5_base64($captcha),
-    patron         => $patron_param,
-    has_guarantor_flag => $patron_param->guarantor_relationships->guarantors->_resultset->count
+    patron         => $patron_param
 );
 
 output_html_with_http_headers $cgi, $cookie, $template->output, undef, { force_no_caching => 1 };