diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl
index a548bab8a6..49ca332e3a 100755
--- a/cataloguing/addbiblio.pl
+++ b/cataloguing/addbiblio.pl
@@ -559,7 +559,7 @@ sub build_tabs {
                             my $subfield = $subfields[$subfieldcount][0];
                             my $value    = $subfields[$subfieldcount][1];
                             next if ( length $subfield != 1 );
-                            next if ( $tagslib->{$tag}->{$subfield}->{tab} ne $tabloop );
+                            next if ( !defined $tagslib->{$tag}->{$subfield} || $tagslib->{$tag}->{$subfield}->{tab} ne $tabloop );
                             push(
                                 @subfields_data,
                                 &create_input(
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
index 90f80bf235..100cabdfb0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
@@ -37,7 +37,7 @@
                                     <span class="caret"></span>
                                 </button>
                                 <ul class="dropdown-menu">
-                                    <li class="z3950searchFw"><a href="#">Default framework</a></li>
+                                    <li id="Default" class="z3950searchFw"><a href="#">Default framework</a></li>
                                     [% FOREACH framework IN frameworks %]
                                         <li id="[% framework.frameworkcode | html %]" class="z3950searchFw"><a href="#">[% framework.frameworktext | html %]</a></li>
                                     [% END %]
@@ -227,7 +227,7 @@
             $("input[name=q]:eq(0)").focus();
 
             $("#z3950search").click(function(){
-                PopupZ3950("");
+                PopupZ3950("Default");
                 return false;
             });