--- plugins/views_plugin_style.inc	2010-12-10 03:12:31.000000000 -0500
+++ ../views/plugins/views_plugin_style.inc	2011-01-10 17:56:23.000000000 -0500
@@ -101,12 +101,14 @@
    * Return the token replaced row class for the specified row.
    */
   function get_row_class($row_index) {
-    $class = $this->options['row_class'];
-    if ($this->uses_fields() && $this->view->field) {
-      $class = $this->tokenize_value($class, $row_index);
-    }
+    if ($this->uses_row_class()) {
+      $class = $this->options['row_class'];
+      if ($this->uses_fields() && $this->view->field) {
+        $class = $this->tokenize_value($class, $row_index);
+      }
 
-    return drupal_clean_css_identifier($class);
+      return drupal_clean_css_identifier($class);
+    }
   }
 
   /**