diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index 0e4777dc2d1..a19b9702a01 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-9353
\ No newline at end of file
+9354
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/.gitrev b/mozilla/webtools/bugzilla/.gitrev
index 0e138864d1a..78c7a22d22d 100644
--- a/mozilla/webtools/bugzilla/.gitrev
+++ b/mozilla/webtools/bugzilla/.gitrev
@@ -1 +1 @@
-a29f798a2506ec2b57cd4f7ebbdaf58387e6e490
\ No newline at end of file
+52ff6aa09dc77100b2b5a9bd696d2042d7573e94
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Config/BugChange.pm b/mozilla/webtools/bugzilla/Bugzilla/Config/BugChange.pm
index 2a225b794f6..986a74485c6 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Config/BugChange.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Config/BugChange.pm
@@ -32,8 +32,13 @@ sub get_param_list {
   };
 
   my $resolution_field = Bugzilla::Field->new({ name => 'resolution', cache => 1 });
-  # The empty resolution is included - it represents "no value"
-  my @resolutions = map {$_->name} @{ $resolution_field->legal_values };
+  my @resolutions = ();
+  # The 'fielddefs' table is not yet populated when running checksetup.pl
+  # for the first time.
+  if ($resolution_field) {
+      # The empty resolution is included - it represents "no value"
+      @resolutions = map {$_->name} @{ $resolution_field->legal_values };
+  }
 
   my @param_list = (
   {