diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/ForgedMethod.java b/processor/src/main/java/org/mapstruct/ap/internal/model/ForgedMethod.java
index a1f5b091c..a33bc7520 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/model/ForgedMethod.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/model/ForgedMethod.java
@@ -196,7 +196,7 @@ public class ForgedMethod implements Method {
     public ForgedMethod(String name, ForgedMethod forgedMethod) {
         this.parameters = forgedMethod.parameters;
         this.returnType = forgedMethod.returnType;
-        this.thrownTypes = new ArrayList<>();
+        this.thrownTypes = forgedMethod.thrownTypes;
         this.history = forgedMethod.history;
 
         this.sourceParameters = Parameter.getSourceParameters( parameters );
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_2839/Car.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2839/Car.java
new file mode 100644
index 000000000..9419223a4
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2839/Car.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright MapStruct Authors.
+ *
+ * Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
+ */
+package org.mapstruct.ap.test.bugs._2839;
+
+import java.util.List;
+
+/**
+ * @author Hakan Özkan
+ */
+public final class Car {
+
+    private final Id id;
+    private final List<? extends Id> seatIds;
+    private final List<? extends Id> tireIds;
+
+    public Car(Id id, List<? extends Id> seatIds, List<? extends Id> tireIds) {
+        this.id = id;
+        this.seatIds = seatIds;
+        this.tireIds = tireIds;
+    }
+
+    public Id getId() {
+        return id;
+    }
+
+    public List<? extends Id> getSeatIds() {
+        return seatIds;
+    }
+
+    public List<? extends Id> getTireIds() {
+        return tireIds;
+    }
+}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_2839/CarDto.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2839/CarDto.java
new file mode 100644
index 000000000..68741ebc9
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2839/CarDto.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright MapStruct Authors.
+ *
+ * Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
+ */
+package org.mapstruct.ap.test.bugs._2839;
+
+import java.util.List;
+
+/**
+ * @author Hakan Özkan
+ */
+public final class CarDto {
+
+    private final String id;
+    private final List<String> seatIds;
+    private final List<String> tireIds;
+
+    public CarDto(String id, List<String> seatIds, List<String> tireIds) {
+        this.id = id;
+        this.seatIds = seatIds;
+        this.tireIds = tireIds;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public List<String> getSeatIds() {
+        return seatIds;
+    }
+
+    public List<String> getTireIds() {
+        return tireIds;
+    }
+}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_2839/CarMapper.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2839/CarMapper.java
new file mode 100644
index 000000000..e535935d2
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2839/CarMapper.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright MapStruct Authors.
+ *
+ * Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
+ */
+package org.mapstruct.ap.test.bugs._2839;
+
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+/**
+ * @author Hakan Özkan
+ */
+@Mapper
+public abstract class CarMapper {
+
+    public static final CarMapper MAPPER = Mappers.getMapper( CarMapper.class );
+
+    public abstract Car toEntity(CarDto dto);
+
+    protected Id mapId(String id) throws Issue2839Exception {
+        throw new Issue2839Exception("For id " + id);
+    }
+
+}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_2839/Id.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2839/Id.java
new file mode 100644
index 000000000..5bb9a29dd
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2839/Id.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright MapStruct Authors.
+ *
+ * Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
+ */
+package org.mapstruct.ap.test.bugs._2839;
+
+import java.util.UUID;
+
+/**
+ * @author Hakan Özkan
+ */
+public class Id {
+
+    private final UUID id;
+
+    public Id() {
+        this.id = UUID.randomUUID();
+    }
+
+    public Id(UUID id) {
+        this.id = id;
+    }
+
+    public UUID getId() {
+        return id;
+    }
+}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_2839/Issue2839Exception.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2839/Issue2839Exception.java
new file mode 100644
index 000000000..91f02014d
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2839/Issue2839Exception.java
@@ -0,0 +1,16 @@
+/*
+ * Copyright MapStruct Authors.
+ *
+ * Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
+ */
+package org.mapstruct.ap.test.bugs._2839;
+
+/**
+ * @author Hakan Özkan
+ */
+public class Issue2839Exception extends Exception {
+
+    public Issue2839Exception(String message) {
+        super( message );
+    }
+}
diff --git a/processor/src/test/java/org/mapstruct/ap/test/bugs/_2839/Issue2839Test.java b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2839/Issue2839Test.java
new file mode 100644
index 000000000..ed61c39a6
--- /dev/null
+++ b/processor/src/test/java/org/mapstruct/ap/test/bugs/_2839/Issue2839Test.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright MapStruct Authors.
+ *
+ * Licensed under the Apache License version 2.0, available at http://www.apache.org/licenses/LICENSE-2.0
+ */
+package org.mapstruct.ap.test.bugs._2839;
+
+import java.util.Collections;
+
+import org.mapstruct.ap.testutil.IssueKey;
+import org.mapstruct.ap.testutil.ProcessorTest;
+import org.mapstruct.ap.testutil.WithClasses;
+
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+/**
+ * @author Hakan Özkan
+ */
+@IssueKey("2839")
+@WithClasses({
+    Car.class,
+    CarDto.class,
+    CarMapper.class,
+    Id.class,
+    Issue2839Exception.class,
+})
+public class Issue2839Test {
+
+    @ProcessorTest
+    void shouldCompile() {
+        CarDto car1 = new CarDto(
+            "carId",
+            Collections.singletonList( "seatId" ),
+            Collections.singletonList( "tireId" )
+        );
+        assertThatThrownBy( () -> CarMapper.MAPPER.toEntity( car1 ) )
+            .isExactlyInstanceOf( RuntimeException.class )
+            .getCause()
+            .isInstanceOf( Issue2839Exception.class )
+            .hasMessage( "For id seatId" );
+
+        CarDto car2 = new CarDto( "carId", Collections.emptyList(), Collections.singletonList( "tireId" ) );
+        assertThatThrownBy( () -> CarMapper.MAPPER.toEntity( car2 ) )
+            .isExactlyInstanceOf( RuntimeException.class )
+            .getCause()
+            .isInstanceOf( Issue2839Exception.class )
+            .hasMessage( "For id tireId" );
+
+        CarDto car3 = new CarDto( "carId", Collections.emptyList(), Collections.emptyList() );
+        assertThatThrownBy( () -> CarMapper.MAPPER.toEntity( car3 ) )
+            .isExactlyInstanceOf( RuntimeException.class )
+            .getCause()
+            .isInstanceOf( Issue2839Exception.class )
+            .hasMessage( "For id carId" );
+    }
+}