diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h
index 65e005abfb77a45dc24337b2c3664d11796c59f8..f6bb0e0fe29a8394014846f11e115a092e1481f5 100644
--- a/indra/llcommon/llstring.h
+++ b/indra/llcommon/llstring.h
@@ -736,8 +736,9 @@ S32 LLStringUtilBase<T>::format(std::basic_string<T>& s, const LLSD& substitutio
 		{
 			std::basic_string<T> param;
 			if (tokens.size() > 2) param = tokens[2];
-
-			found_replacement = formatDatetime (replacement, tokens[0], param, substitutions);
+			
+			S32 secFromEpoch = (S32) substitutions["datetime"].asInteger();
+			found_replacement = formatDatetime (replacement, tokens[0], param, secFromEpoch);
 		}
 
 		if (found_replacement)
diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp
index f5525ec1f29bbdc65d45a8be830ee4f46f2dafd5..c41900d691953f1267f88adc7518b209dfb4f7b8 100644
--- a/indra/newview/llinventoryfilter.cpp
+++ b/indra/newview/llinventoryfilter.cpp
@@ -115,7 +115,7 @@ BOOL LLInventoryFilter::check(LLFolderViewItem* item)
 		if (listener->getInventoryType() == LLInventoryType::IT_NONE)
 		{
 			const LLInventoryObject *obj = gInventory.getObject(listener->getUUID());
-			if (!obj->getIsLinkType())
+			if (obj && !obj->getIsLinkType())
 			{
 				passed_type = TRUE;
 			}