2 files changed, 18 insertions, 8 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Council.pm b/perllib/FixMyStreet/App/Controller/Council.pm
index 48248e4fe..c4819765a 100644
--- a/perllib/FixMyStreet/App/Controller/Council.pm
+++ b/perllib/FixMyStreet/App/Controller/Council.pm
@@ -82,7 +82,7 @@ sub load_and_check_councils : Private {
     $c->cobrand->remove_redundant_councils($all_councils) if $c->stash->{remove_redundant_councils};
 
     # If we don't have any councils we can't accept the report
-    if ( !scalar keys %$all_councils ) {
+    if ( !scalar keys %$all_councils || $all_councils->{error}) {
         $c->stash->{location_offshore} = 1;
         return;
     }
diff --git a/perllib/FixMyStreet/Cobrand/FixMyBarangay.pm b/perllib/FixMyStreet/Cobrand/FixMyBarangay.pm
index 965096911..0328ff334 100644
--- a/perllib/FixMyStreet/Cobrand/FixMyBarangay.pm
+++ b/perllib/FixMyStreet/Cobrand/FixMyBarangay.pm
@@ -1,22 +1,32 @@
 package FixMyStreet::Cobrand::FixMyBarangay;
-use base 'FixMyStreet::Cobrand::UKCouncils';
+use base 'FixMyStreet::Cobrand::Default';
 
 use strict;
 use warnings;
 
-sub council_id { return 0; }
-sub council_area { return 'FixMyBarangay'; }
-sub council_name { return 'FixMyBarangay'; }
-sub council_url { return 'fmb'; }
+sub path_to_web_templates {
+    my $self = shift;
+    return [
+        FixMyStreet->path_to( 'templates/web', $self->moniker )->stringify,
+        FixMyStreet->path_to( 'templates/web/fixmystreet' )->stringify
+    ];
+}
+
+sub country {
+    return 'PH';
+}
 
 sub disambiguate_location {
     return {
         country => 'ph',
-        bing_culture => 'en',
-        bing_country => 'The Philippines'
+        bing_country => 'Philippines',
     };
 }
 
+sub site_title {
+    my ($self) = @_;
+    return 'FixMyBarangay';
+}
 
 1;