diff --git a/src/corelib/kernel/qjniobject.cpp b/src/corelib/kernel/qjniobject.cpp
index f75b5bc9d25..a7497f96242 100644
--- a/src/corelib/kernel/qjniobject.cpp
+++ b/src/corelib/kernel/qjniobject.cpp
@@ -346,11 +346,9 @@ static jclass getCachedClass(const QByteArray &className)
 */
 static QJniObject getCleanJniObject(jobject object, JNIEnv *env)
 {
-    if (!object)
-        return QJniObject();
-
-    if (QJniEnvironment::checkAndClearExceptions(env)) {
-        env->DeleteLocalRef(object);
+    if (QJniEnvironment::checkAndClearExceptions(env) || !object) {
+        if (object)
+            env->DeleteLocalRef(object);
         return QJniObject();
     }
 
diff --git a/tests/auto/corelib/kernel/qjniobject/testdata/src/org/qtproject/qt/android/testdata/QtJniObjectTestClass.java b/tests/auto/corelib/kernel/qjniobject/testdata/src/org/qtproject/qt/android/testdata/QtJniObjectTestClass.java
index 5b983407a3c..36f47632692 100644
--- a/tests/auto/corelib/kernel/qjniobject/testdata/src/org/qtproject/qt/android/testdata/QtJniObjectTestClass.java
+++ b/tests/auto/corelib/kernel/qjniobject/testdata/src/org/qtproject/qt/android/testdata/QtJniObjectTestClass.java
@@ -319,4 +319,12 @@ public class QtJniObjectTestClass
     {
         return callbackWithDouble(value);
     }
+
+    public Object callMethodThrowsException() throws Exception {
+        throw new Exception();
+    }
+
+    public static Object callStaticMethodThrowsException() throws Exception {
+        throw new Exception();
+    }
 }
diff --git a/tests/auto/corelib/kernel/qjniobject/tst_qjniobject.cpp b/tests/auto/corelib/kernel/qjniobject/tst_qjniobject.cpp
index 6af3c300141..16a27bcf01a 100644
--- a/tests/auto/corelib/kernel/qjniobject/tst_qjniobject.cpp
+++ b/tests/auto/corelib/kernel/qjniobject/tst_qjniobject.cpp
@@ -40,10 +40,12 @@ private slots:
 
     void ctor();
     void callMethodTest();
+    void callMethodThrowsException();
     void callObjectMethodTest();
     void stringConvertionTest();
     void compareOperatorTests();
     void className();
+    void callStaticMethodThrowsException();
     void callStaticObjectMethodClassName();
     void callStaticObjectMethod();
     void callStaticObjectMethodById();
@@ -262,6 +264,15 @@ void tst_QJniObject::callMethodTest()
     }
 }
 
+void tst_QJniObject::callMethodThrowsException()
+{
+    QtJniTypes::QtJniObjectTestClass instance;
+    QTest::ignoreMessage(QtWarningMsg, QRegularExpression("java.lang.Exception"));
+    auto res = instance.callMethod<jobject>("callMethodThrowsException");
+    QVERIFY(!res.isValid());
+    QVERIFY(!QJniEnvironment().checkAndClearExceptions());
+}
+
 void tst_QJniObject::callObjectMethodTest()
 {
     const QString qString = QLatin1String("Hello, Java");
@@ -339,6 +350,15 @@ void tst_QJniObject::className()
     }
 }
 
+void tst_QJniObject::callStaticMethodThrowsException()
+{
+    QTest::ignoreMessage(QtWarningMsg, QRegularExpression("java.lang.Exception"));
+    auto res = QtJniTypes::QtJniObjectTestClass::callStaticMethod<jobject>(
+            "callStaticMethodThrowsException");
+    QVERIFY(!res.isValid());
+    QVERIFY(!QJniEnvironment().checkAndClearExceptions());
+}
+
 void tst_QJniObject::callStaticObjectMethodClassName()
 {
     QJniObject formatString = QJniObject::fromString(QLatin1String("test format"));