diff --git a/modules/ts/misc/run.py b/modules/ts/misc/run.py
index 79dad8d8fd45177b178c6a1cd550cc32900c31be..737a2eea355c0883c955097db984f049f1a1552b 100644
--- a/modules/ts/misc/run.py
+++ b/modules/ts/misc/run.py
@@ -337,10 +337,9 @@ class RunInfo(object):
 
     def getSvnVersion(self, path, name):
         if not path:
-            setattr(self, name, None)
-            return
-        if not self.svnversion_path and hostos == 'nt':
-            self.tryGetSvnVersionWithTortoise(path, name)
+            val = None
+        elif not self.svnversion_path and hostos == 'nt':
+            val = self.tryGetSvnVersionWithTortoise(path, name)
         else:
             svnversion = self.svnversion_path
             if not svnversion:
@@ -348,11 +347,14 @@ class RunInfo(object):
             try:
                 output = Popen([svnversion, "-n", path], stdout=PIPE, stderr=PIPE).communicate()
                 if not output[1]:
-                    setattr(self, name, output[0])
+                    val = output[0]
                 else:
-                    setattr(self, name, None)
+                    val = None
             except OSError:
-                setattr(self, name, None)
+                val = None
+        if val:
+            val = val.replace(" ", "_")
+        setattr(self, name, val)
 
     def tryGetSvnVersionWithTortoise(self, path, name):
         try:
@@ -371,9 +373,9 @@ class RunInfo(object):
                 tmpfile = open(tmpfilename2, "r")
                 version = tmpfile.read()
                 tmpfile.close()
-            setattr(self, name, version)
+            return version
         except:
-            setattr(self, name, None)
+            return None
         finally:
             if dir:
                 shutil.rmtree(dir)