Index: /trunk/src/VBox/NetworkServices/DHCP/VBoxNetDHCP.cpp
===================================================================
--- /trunk/src/VBox/NetworkServices/DHCP/VBoxNetDHCP.cpp	(revision 49825)
+++ /trunk/src/VBox/NetworkServices/DHCP/VBoxNetDHCP.cpp	(revision 49826)
@@ -480,15 +480,11 @@
     std::string networkName = getNetwork();
 
-    HRESULT hrc = virtualbox->FindDHCPServerByNetworkName(com::Bstr(networkName.c_str()).raw(),
-                                                          m_DhcpServer.asOutParam());
-    AssertComRCReturn(hrc, VERR_INTERNAL_ERROR);
-
-    hrc = virtualbox->FindNATNetworkByName(com::Bstr(networkName.c_str()).raw(),
-                                           m_NATNetwork.asOutParam());
-
-    BOOL fNeedDhcpServer = false;
-    if (FAILED(m_NATNetwork->COMGETTER(NeedDhcpServer)(&fNeedDhcpServer)))
-        return VERR_INTERNAL_ERROR;
-
+    int rc = findDhcpServer(virtualbox, networkName, m_DhcpServer);
+    AssertRCReturn(rc, rc);
+
+    rc = findNatNetwork(virtualbox, networkName, m_NATNetwork);
+    AssertRCReturn(rc, rc);
+
+    BOOL fNeedDhcpServer = isDhcpRequired(m_NATNetwork);
     if (!fNeedDhcpServer)
         return VERR_CANCELLED;
@@ -496,6 +492,5 @@
     RTNETADDRIPV4 gateway;
     com::Bstr strGateway;
-
-    hrc = m_NATNetwork->COMGETTER(Gateway)(strGateway.asOutParam());
+    HRESULT hrc = m_NATNetwork->COMGETTER(Gateway)(strGateway.asOutParam());
     AssertComRCReturn(hrc, VERR_INTERNAL_ERROR);
     RTNetStrToIPv4Addr(com::Utf8Str(strGateway).c_str(), &gateway);
@@ -505,5 +500,5 @@
     confManager->addToAddressList(RTNET_DHCP_OPT_ROUTERS, gateway);
 
-    int rc = fetchAndUpdateDnsInfo();
+    rc = fetchAndUpdateDnsInfo();
     AssertMsgRCReturn(rc, ("Wasn't able to fetch Dns info"), rc);