diff --git a/src/include/iscsi-lio-server/widgets.rb b/src/include/iscsi-lio-server/widgets.rb
index bd23b6c..698b2ac 100644
--- a/src/include/iscsi-lio-server/widgets.rb
+++ b/src/include/iscsi-lio-server/widgets.rb
@@ -883,16 +883,17 @@ def initModify(key)
         ""
       )
       Builtins.y2milestone("initModify ipp:%1", ipp)
+      ip, port = IscsiLioData.GetIpAndPort(ipp)
       UI.ChangeWidget(
         Id(:ipaddr),
         :Value,
-        Ops.get(IscsiLioData.GetIpAndPort(ipp), 0, "")
+        ip || ""
       )
       UI.ChangeWidget(Id(:ipaddr), :Enabled, true)
       UI.ChangeWidget(
         Id(:port),
         :Value,
-        Ops.get(IscsiLioData.GetIpAndPort(ipp), 1, "3260")
+        port || ""
       )
       UI.ChangeWidget(Id(:port), :Enabled, true)
       UI.ChangeWidget(
diff --git a/src/modules/IscsiLioData.rb b/src/modules/IscsiLioData.rb
index 9171d72..59fdb99 100644
--- a/src/modules/IscsiLioData.rb
+++ b/src/modules/IscsiLioData.rb
@@ -47,11 +47,14 @@ def SplitStringNE(str, delim)
     end
 
     def GetIpAndPort(np)
+      return [] if !np || np.empty?
+
       if !np.start_with?("[")
         ret = Builtins.splitstring(np, ":")
-      else
-        match_data = np.match(/\[([:\w]+)\]:(\d+)/)
+      elsif match_data = np.match(/\[([:\w]+)\]:(\d+)/)
         ret = [match_data[1] || "", match_data[2] || ""]
+      else
+        ret = []
       end
       ret
     end