diff --git a/module/testcase/control.php b/module/testcase/control.php
index 56b327edac..0adfbd2e6d 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -1525,6 +1525,7 @@ class testcase extends control
                         }
                         elseif(isset($num))
                         {
+                            if(!isset($caseStep[$num]['content'])) $caseStep[$num]['content'] = '';
                             $caseStep[$num]['content'] .= "\n" . $step;
                         }
                         else
diff --git a/module/testsuite/control.php b/module/testsuite/control.php
index 1dfc8b1745..5bcf6f1d3d 100644
--- a/module/testsuite/control.php
+++ b/module/testsuite/control.php
@@ -911,7 +911,16 @@ class testsuite extends control
                 }
                 else
                 {
-                    $steps    = explode("\n", $cellValue);
+                    $steps = (array)$cellValue;
+                    if(strpos($cellValue, "\n"))
+                    {
+                        $steps = explode("\n", $cellValue);
+                    }
+                    elseif(strpos($cellValue, "\r"))
+                    {
+                        $steps = explode("\r", $cellValue);
+                    }
+
                     $stepKey  = str_replace('step', '', strtolower($field));
                     $caseStep = array();
 
@@ -941,6 +950,7 @@ class testsuite extends control
                         }
                         elseif(isset($num))
                         {
+                            if(!isset($caseStep[$num]['content'])) $caseStep[$num]['content'] = '';
                             $caseStep[$num]['content'] .= "\n" . $step;
                         }
                         else