diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index 886ea223f12..f5efeb90441 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-9040
\ No newline at end of file
+9041
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/.gitrev b/mozilla/webtools/bugzilla/.gitrev
index 8153d9375f3..98a8fd90213 100644
--- a/mozilla/webtools/bugzilla/.gitrev
+++ b/mozilla/webtools/bugzilla/.gitrev
@@ -1 +1 @@
-6d730fae2211b9319037b7cb0515351fa529e78c
\ No newline at end of file
+b5b5061ca90acd1e65fc5e2073dedf721117e553
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Memcached.pm b/mozilla/webtools/bugzilla/Bugzilla/Memcached.pm
index 819b6d8b6b9..1464b6c003e 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Memcached.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Memcached.pm
@@ -166,11 +166,11 @@ sub clear_all {
 
 sub clear_config {
     my ($self, $args) = @_;
+    return unless $self->{memcached};
     if ($args && exists $args->{key}) {
         $self->_delete($self->_config_prefix . '.' . $args->{key});
     }
     else {
-        return unless $self->{memcached};
         $self->_inc_prefix("config");
     }
 }
diff --git a/mozilla/webtools/bugzilla/Bugzilla/User.pm b/mozilla/webtools/bugzilla/Bugzilla/User.pm
index 6b5d13cbed3..81ce228e700 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/User.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/User.pm
@@ -668,8 +668,8 @@ sub flush_queries_cache {
 sub groups {
     my $self = shift;
 
-    return [] unless $self->id;
     return $self->{groups} if defined $self->{groups};
+    return [] unless $self->id;
 
     my $user_groups_key = "user_groups." . $self->id;
     my $groups = Bugzilla->memcached->get_config({