diff --git a/C4/Letters.pm b/C4/Letters.pm
index 497b97dab9..3f2fc95a4b 100644
--- a/C4/Letters.pm
+++ b/C4/Letters.pm
@@ -626,7 +626,8 @@ sub GetPreparedLetter {
          return;
     my $want_librarian = $params{want_librarian};
     if ($want_librarian) {
-        $objects->{librarian} = Koha::Patrons->find( C4::Context->userenv->{number} );
+        my $userenv = C4::Context->userenv;
+        $objects->{librarian} = Koha::Patrons->find( C4::Context->userenv->{number} ) if ($userenv);
     }
 
     # Best guess at language 'default' notice is written for include handling
diff --git a/Koha/Ticket.pm b/Koha/Ticket.pm
index eb2580032e..18f9c672a3 100644
--- a/Koha/Ticket.pm
+++ b/Koha/Ticket.pm
@@ -176,7 +176,8 @@ sub store {
         }
     } else {
         my %updated_columns = $self->_result->get_dirty_columns;
-        return $self->SUPER::store unless %updated_columns;
+        $self->SUPER::store;
+        $self->discard_changes;
 
         $assignee = ( exists $updated_columns{assignee_id} ) ? $self->assignee : undef;
     }