diff --git a/core-java/src/main/java/com/baeldung/classnotfoundexception/ClassNotFoundExceptionExample.java b/core-java/src/main/java/com/baeldung/classnotfoundexception/ClassNotFoundExceptionExample.java
new file mode 100644
index 0000000000..26d306d03f
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/classnotfoundexception/ClassNotFoundExceptionExample.java
@@ -0,0 +1,7 @@
+package com.baeldung.classnotfoundexception;
+
+public class ClassNotFoundExceptionExample {
+    public void loadDrivers() throws ClassNotFoundException {
+        Class.forName("oracle.jdbc.driver.OracleDriver");
+    }
+}
diff --git a/core-java/src/main/java/com/baeldung/noclassdeffounderror/ClassWithInitErrors.java b/core-java/src/main/java/com/baeldung/noclassdeffounderror/ClassWithInitErrors.java
new file mode 100644
index 0000000000..2b19f3496d
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/noclassdeffounderror/ClassWithInitErrors.java
@@ -0,0 +1,5 @@
+package com.baeldung.noclassdeffounderror;
+
+public class ClassWithInitErrors {
+    static int data = 1 / 0;
+}
diff --git a/core-java/src/main/java/com/baeldung/noclassdeffounderror/NoClassDefFoundErrorExample.java b/core-java/src/main/java/com/baeldung/noclassdeffounderror/NoClassDefFoundErrorExample.java
new file mode 100644
index 0000000000..2c852b5e82
--- /dev/null
+++ b/core-java/src/main/java/com/baeldung/noclassdeffounderror/NoClassDefFoundErrorExample.java
@@ -0,0 +1,14 @@
+package com.baeldung.noclassdeffounderror;
+
+public class NoClassDefFoundErrorExample {
+    public ClassWithInitErrors getClassWithInitErrors() {
+        ClassWithInitErrors test;
+        try {
+            test = new ClassWithInitErrors();
+        } catch (Throwable t) {
+            System.out.println(t);
+        }
+        test = new ClassWithInitErrors();
+        return test;
+    }
+}
diff --git a/core-java/src/test/java/com/baeldung/classnotfoundexception/ClassNotFoundExceptionTest.java b/core-java/src/test/java/com/baeldung/classnotfoundexception/ClassNotFoundExceptionTest.java
new file mode 100644
index 0000000000..2a16b7effd
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/classnotfoundexception/ClassNotFoundExceptionTest.java
@@ -0,0 +1,12 @@
+package com.baeldung.classnotfoundexception;
+
+import org.junit.Test;
+
+public class ClassNotFoundExceptionTest {
+
+    @Test(expected = ClassNotFoundException.class)
+    public void givenNoDriversInClassPath_whenLoadDrivers_thenClassNotFoundException() throws ClassNotFoundException {
+        ClassNotFoundExceptionExample test = new ClassNotFoundExceptionExample();
+        test.loadDrivers();
+    }
+}
diff --git a/core-java/src/test/java/com/baeldung/noclassdeffounderror/NoClassDefFoundErrorTest.java b/core-java/src/test/java/com/baeldung/noclassdeffounderror/NoClassDefFoundErrorTest.java
new file mode 100644
index 0000000000..bb446dc385
--- /dev/null
+++ b/core-java/src/test/java/com/baeldung/noclassdeffounderror/NoClassDefFoundErrorTest.java
@@ -0,0 +1,12 @@
+package com.baeldung.noclassdeffounderror;
+
+import org.junit.Test;
+
+public class NoClassDefFoundErrorTest {
+
+    @Test(expected = NoClassDefFoundError.class)
+    public void givenInitErrorInClass_whenloadClass_thenNoClassDefFoundError() {
+        NoClassDefFoundErrorExample sample = new NoClassDefFoundErrorExample();
+        sample.getClassWithInitErrors();
+    }
+}