diff --git a/core-java-modules/core-java-exceptions-2/pom.xml b/core-java-modules/core-java-exceptions-2/pom.xml
index 2f7f613faf..955d7153fa 100644
--- a/core-java-modules/core-java-exceptions-2/pom.xml
+++ b/core-java-modules/core-java-exceptions-2/pom.xml
@@ -13,12 +13,24 @@
 		<version>0.0.1-SNAPSHOT</version>
 		<relativePath>../../parent-java</relativePath>
 	</parent>
+	
+	<dependencies>
+		<!-- test scoped -->
+		<dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj-core.version}</version>
+            <scope>test</scope>
+        </dependency>
+	</dependencies>
 
 	<description> </description>
 	<url>http://maven.apache.org</url>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<!-- testing -->
+		<assertj-core.version>3.10.0</assertj-core.version>
 	</properties>
 
 </project>
diff --git a/core-java-modules/core-java-exceptions-2/src/main/java/com/baeldung/exceptions/UnknownHostExceptionHandling.java b/core-java-modules/core-java-exceptions-2/src/main/java/com/baeldung/exceptions/UnknownHostExceptionHandling.java
new file mode 100644
index 0000000000..0e1c36f64c
--- /dev/null
+++ b/core-java-modules/core-java-exceptions-2/src/main/java/com/baeldung/exceptions/UnknownHostExceptionHandling.java
@@ -0,0 +1,28 @@
+package com.baeldung.exceptions;
+
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.UnknownHostException;
+
+public class UnknownHostExceptionHandling {
+
+    public static int getResponseCode(String hostname) throws IOException {
+        URL url = new URL(hostname.trim());
+        HttpURLConnection con = (HttpURLConnection) url.openConnection();
+        int resCode = -1;
+        try {
+            resCode = con.getResponseCode();
+        } catch (UnknownHostException e){
+            con.disconnect();
+        }
+        return resCode;
+    }
+    
+    public static int getResponseCodeUnhandled(String hostname) throws IOException {
+        URL url = new URL(hostname.trim());
+        HttpURLConnection con = (HttpURLConnection) url.openConnection();
+        int resCode = con.getResponseCode();
+        return resCode;
+    }
+}
diff --git a/core-java-modules/core-java-exceptions-2/src/test/java/com/baeldung/exceptions/UnknownHostExceptionHandlingUnitTest.java b/core-java-modules/core-java-exceptions-2/src/test/java/com/baeldung/exceptions/UnknownHostExceptionHandlingUnitTest.java
new file mode 100644
index 0000000000..d4b53e2dce
--- /dev/null
+++ b/core-java-modules/core-java-exceptions-2/src/test/java/com/baeldung/exceptions/UnknownHostExceptionHandlingUnitTest.java
@@ -0,0 +1,15 @@
+package com.baeldung.exceptions;
+
+import java.io.IOException;
+import java.net.UnknownHostException;
+
+import org.junit.Test;
+
+public class UnknownHostExceptionHandlingUnitTest {
+
+    @Test(expected = UnknownHostException.class)
+    public void givenUnknownHost_whenResolve_thenUnknownHostException() throws IOException {
+        UnknownHostExceptionHandling.getResponseCodeUnhandled("http://locaihost");
+    }
+    
+}