diff --git a/plugins/views_plugin_style.inc b/plugins/views_plugin_style.inc
index 084e65d..ba335d6 100644
--- a/plugins/views_plugin_style.inc
+++ b/plugins/views_plugin_style.inc
@@ -105,16 +105,17 @@ class views_plugin_style extends views_plugin {
    */
   function get_row_class($row_index) {
     if ($this->uses_row_class()) {
-      $class = $this->options['row_class'];
       if ($this->uses_fields() && $this->view->field) {
-        $class = strip_tags($this->tokenize_value($class, $row_index));
-      }
-
-      $classes = explode(' ', $class);
-      foreach ($classes as &$class) {
-        $class = drupal_clean_css_identifier($class);
+        if ($values = explode(' ', $this->options['row_class'])){
+          $classes = array();
+          foreach ($values as $value) {
+            if ($class = strip_tags($this->tokenize_value($value, $row_index))) {
+              $classes[] = drupal_clean_css_identifier($class);
+            }
+          }
+          return implode(' ', $classes);
+        }
       }
-      return implode(' ', $classes);
     }
   }