diff --git a/ChangeLog b/ChangeLog
index 10d81e40c..c6795938b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-17  Teijo Kinnunen <Teijo.Kinnunen@nuance.com>
+
+	Fix Savannah bug #30788.
+
+	* src/cache/ftccache.c (FTC_Cache_Clear): Check `cache->buckets' for
+	NULL too.
+
 2010-08-10  Werner Lemberg  <wl@gnu.org>
 
 	Try to fix Savannah bug #30717 (and probably #30719 too).
diff --git a/src/cache/ftccache.c b/src/cache/ftccache.c
index 67affeacb..e0d43d5ad 100644
--- a/src/cache/ftccache.c
+++ b/src/cache/ftccache.c
@@ -346,7 +346,7 @@
   static void
   FTC_Cache_Clear( FTC_Cache  cache )
   {
-    if ( cache )
+    if ( cache && cache->buckets )
     {
       FTC_Manager  manager = cache->manager;
       FT_UFast     i;