diff --git a/app/models/additional_route_endpoint.rb b/app/models/additional_route_endpoint.rb
index 5d4aa306..376cfa68 100644
--- a/app/models/additional_route_endpoint.rb
+++ b/app/models/additional_route_endpoint.rb
@@ -37,9 +37,7 @@ def _endpoint
   end
 
   def _endpoint=(value)
-    if value.blank?
-      self.endpoint = nil
-    elsif value =~ /\#/
+    if value && value =~ /\#/
       class_name, id = value.split("#", 2)
       unless Route::ENDPOINT_TYPES.include?(class_name)
         raise Postal::Error, "Invalid endpoint class name '#{class_name}'"
diff --git a/lib/postal/message_db/database.rb b/lib/postal/message_db/database.rb
index 3b8f6da7..180e4d47 100644
--- a/lib/postal/message_db/database.rb
+++ b/lib/postal/message_db/database.rb
@@ -306,9 +306,7 @@ def escape(value)
             "1"
           elsif value == false
             "0"
-          elsif value.nil?
-            "NULL"
-          elsif value.to_s.empty?
+          elsif value.nil? || value.to_s.empty?
             "NULL"
           else
             "'" + mysql.escape(value.to_s) + "'"