diff --git a/[refs] b/[refs]
index 8df9b925f41e..1bb8414e5fba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6cb56fc94f4efaec2d4ad74bed2be7883179ccd
+refs/heads/master: e00fb3f7af111d1b3252f7d622213d2e22be65f5
diff --git a/trunk/security/tomoyo/domain.c b/trunk/security/tomoyo/domain.c
index da16dfeed728..9027ac1534af 100644
--- a/trunk/security/tomoyo/domain.c
+++ b/trunk/security/tomoyo/domain.c
@@ -515,7 +515,8 @@ struct tomoyo_domain_info *tomoyo_assign_domain(const char *domainname,
 			 * that domain. Do not perform domain transition if
 			 * profile for that domain is not yet created.
 			 */
-			if (!entry->ns->profile_ptr[entry->profile])
+			if (tomoyo_policy_loaded &&
+			    !entry->ns->profile_ptr[entry->profile])
 				return NULL;
 		}
 		return entry;