diff --git a/indra/newview/statemachine/aifetchinventoryfolder.h b/indra/newview/statemachine/aifetchinventoryfolder.h
index c83c3ef1b..9a818fa36 100644
--- a/indra/newview/statemachine/aifetchinventoryfolder.h
+++ b/indra/newview/statemachine/aifetchinventoryfolder.h
@@ -79,6 +79,7 @@ class AIFetchInventoryFolder : public AIStateMachine {
 	void fetch(LLUUID const& parentUUID, std::string const& foldername, bool create = false, bool fetch_contents = true)
 	{
 	  mParentFolder = parentUUID;
+	  mCreate = create;
 	  mFetchContents = fetch_contents;
 	  if (mFolderName != foldername)
 	  {
diff --git a/indra/newview/statemachine/aistatemachine.cpp b/indra/newview/statemachine/aistatemachine.cpp
index e8a0d99de..2eccfb53e 100644
--- a/indra/newview/statemachine/aistatemachine.cpp
+++ b/indra/newview/statemachine/aistatemachine.cpp
@@ -343,7 +343,7 @@ void AIStateMachine::mainloop(void*)
 	}
 	else
 	{
-	  llassert(statemachine.mState == bs_run);
+	  llassert(statemachine.mState == bs_run || statemachine.mState == bs_initialize);
 	  ++iter;
 	}
   }