diff --git a/mozilla/webtools/bugzilla/Bugzilla/Install/Util.pm b/mozilla/webtools/bugzilla/Bugzilla/Install/Util.pm
index 9bab77a8a76..cb6b27786b0 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Install/Util.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Install/Util.pm
@@ -118,7 +118,7 @@ sub template_include_path {
     # we support every language installed in the template/ directory.
     
     my @wanted;
-    if (defined $params->{only_language}) {
+    if ($params->{only_language}) {
         @wanted = ($params->{only_language});
     }
     else {
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Template.pm b/mozilla/webtools/bugzilla/Bugzilla/Template.pm
index 6b53d5ae3be..863c815af72 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Template.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Template.pm
@@ -85,11 +85,10 @@ sub _load_constants {
 # Templates may also be found in the extensions/ tree
 sub getTemplateIncludePath {
     my $cache = Bugzilla->request_cache;
-    my $lang  = $cache->{'language'} || undef;
+    my $lang  = $cache->{'language'} || '';
     $cache->{"template_include_path_$lang"} ||= template_include_path({
         use_languages => Bugzilla->languages,
         only_language => $lang });
-    $lang ||= '';
     return $cache->{"template_include_path_$lang"};
 }