diff --git a/src/java/Class.hxx b/src/java/Class.hxx
index 44425d1b7..860f156b6 100644
--- a/src/java/Class.hxx
+++ b/src/java/Class.hxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2011 Max Kellermann <max.kellermann@gmail.com>
+ * Copyright (C) 2010-2018 Max Kellermann <max.kellermann@gmail.com>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -31,6 +31,7 @@
 #define JAVA_CLASS_HXX
 
 #include "Ref.hxx"
+#include "Exception.hxx"
 
 #include <assert.h>
 
@@ -68,10 +69,8 @@ namespace Java {
 			assert(name != nullptr);
 
 			jclass cls = env->FindClass(name);
-			if (cls == nullptr) {
-				env->ExceptionClear();
+			if (DiscardException(env))
 				return false;
-			}
 
 			Set(env, cls);
 			env->DeleteLocalRef(cls);