diff --git a/Scripts/sogod-wrapper b/Scripts/sogod-wrapper
index 5271d5fe5..5d11000ca 100755
--- a/Scripts/sogod-wrapper
+++ b/Scripts/sogod-wrapper
@@ -60,7 +60,7 @@ else
 fi
 
 woport=`defaults read sogod WOPort`
-if [ "$?" == "0" ]
+if [ "$?" -eq 0 ]
 then
   startport=`echo $woport | awk '{print $3}' | sed -e 's/\(.*:\)//'`
 else
@@ -75,6 +75,11 @@ else
 fi
 listen=`echo $woport | awk '{ print $3 }' | sed -e 's/\([0-9]\+\)$/'$port'/g'`
 
+if [ -z "$listen" ]
+then
+  listen=$port
+fi
+
 # echo "SOGOD: $sogod -WOPort $listen" 2>&1
 
 exec $sogod -WOPort $listen >> /var/log/sogo/sogod-$port.log 2>&1 &