diff --git a/lib/active_record/connection_adapters/oracle_enhanced/oci_connection.rb b/lib/active_record/connection_adapters/oracle_enhanced/oci_connection.rb
index 345bee1b2..fddd383e7 100644
--- a/lib/active_record/connection_adapters/oracle_enhanced/oci_connection.rb
+++ b/lib/active_record/connection_adapters/oracle_enhanced/oci_connection.rb
@@ -165,7 +165,7 @@ def fetch(options = {})
                   key = col_metadata.data_type
                   case key.to_s.downcase
                   when "char"
-                    col_value = col.to_s.rstrip
+                    col_value = col.to_s.rstrip unless col_value.nil?
                   end
                 end
                 col_index = col_index + 1
@@ -207,7 +207,7 @@ def select(sql, name = nil, return_column_names = false)
                 key = col_metadata.data_type
                 case key.to_s.downcase
                 when "char"
-                  col_value = col_value.to_s.rstrip
+                  col_value = col_value.to_s.rstrip unless col_value.nil?
                 end
               end
               hash[col] = col_value