diff --git a/src/ChangeLog b/src/ChangeLog
index e543fe7655f..3f6a45a4118 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-01  Karel Klíč  <kklic@redhat.com>
+
+	* fileio.c (Ffile_selinux_context): Context functions may return null.
+
 2010-04-30  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* s/gnu.h (POSIX_SIGNALS):
diff --git a/src/fileio.c b/src/fileio.c
index 4bfbae91844..13825a54212 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -2918,10 +2918,14 @@ if file does not exist, is not accessible, or SELinux is disabled */)
       if (conlength > 0)
 	{
 	  context = context_new (con);
-	  values[0] = build_string (context_user_get (context));
-	  values[1] = build_string (context_role_get (context));
-	  values[2] = build_string (context_type_get (context));
-	  values[3] = build_string (context_range_get (context));
+	  if (context_user_get (context))
+	    values[0] = build_string (context_user_get (context));
+	  if (context_role_get (context))
+	    values[1] = build_string (context_role_get (context));
+	  if (context_type_get (context))
+	    values[2] = build_string (context_type_get (context));
+	  if (context_range_get (context))
+	    values[3] = build_string (context_range_get (context));
 	  context_free (context);
 	}
       if (con)