diff --git a/programs/network/downloader/downloader.asm b/programs/network/downloader/downloader.asm
index 16b860b591..2545782467 100644
--- a/programs/network/downloader/downloader.asm
+++ b/programs/network/downloader/downloader.asm
@@ -822,9 +822,8 @@ pu_010:
         push    webAddr
         call    [getaddrinfo]
         pop     esi
-; TODO: handle error
-;        test    eax, eax
-;        jnz     .fail_dns
+        test    eax, eax
+        jnz     .fail_dns
 
 ; fill in ip
         mov     eax, [esi + addrinfo.ai_addr]
@@ -839,6 +838,12 @@ pu_010:
 
         ret
 
+  .fail_dns:
+        DEBUGF  1, "DNS resolution failed\n"
+        mov     [server_ip], 0
+
+        ret
+
 ;***************************************************************************
 ;   Function
 ;       append_proxy_auth_header