2 files changed, 10 insertions, 1 deletions
diff --git a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
index f39558f45..ca041bf70 100644
--- a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
+++ b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm
@@ -347,4 +347,13 @@ sub manifest {
     };
 }
 
+sub report_new_munge_before_insert {
+    my ($self, $report) = @_;
+
+    # Make sure TfL reports are marked safety critical
+    $self->SUPER::report_new_munge_before_insert($report);
+
+    FixMyStreet::Cobrand::Buckinghamshire::report_new_munge_before_insert($self, $report);
+}
+
 1;
diff --git a/perllib/FixMyStreet/Reporting.pm b/perllib/FixMyStreet/Reporting.pm
index b5b5876b9..4573d78fc 100644
--- a/perllib/FixMyStreet/Reporting.pm
+++ b/perllib/FixMyStreet/Reporting.pm
@@ -88,7 +88,7 @@ has filename => ( is => 'rw', isa => Str, lazy => 1, default => sub {
         $self->on_updates ? ('updates') : (),
         map {
             my $value = $where{$_};
-            (my $nosp = $value) =~ s/ /-/g;
+            (my $nosp = $value || '') =~ s/ /-/g;
             (defined $value and length $value) ? ($_, $nosp) : ()
         } sort keys %where
 });