diff --git a/Src/Utilities/pcpatrflex/ToneParsFLExDll/ANABuilder.cs b/Src/Utilities/pcpatrflex/ToneParsFLExDll/ANABuilder.cs
index 9457f99d01..ac8ec716ea 100644
--- a/Src/Utilities/pcpatrflex/ToneParsFLExDll/ANABuilder.cs
+++ b/Src/Utilities/pcpatrflex/ToneParsFLExDll/ANABuilder.cs
@@ -208,7 +208,7 @@ private string GetAnaProperties(ParseMorph pMorph)
 				case MoStemMsaTags.kClassId:
 					var stemMsa = msa as IMoStemMsa;
 					sb.Append("RootPOS");
-					sb.Append(stemMsa.PartOfSpeechRA.Hvo);
+					sb.Append((stemMsa.PartOfSpeechRA != null) ? stemMsa.PartOfSpeechRA.Hvo : 0);
 					break;
 				case MoInflAffMsaTags.kClassId:
 					break;
diff --git a/Src/Utilities/pcpatrflex/ToneParsFLExDll/ToneParsInvoker.cs b/Src/Utilities/pcpatrflex/ToneParsFLExDll/ToneParsInvoker.cs
index 824d75fb02..5785886240 100644
--- a/Src/Utilities/pcpatrflex/ToneParsFLExDll/ToneParsInvoker.cs
+++ b/Src/Utilities/pcpatrflex/ToneParsFLExDll/ToneParsInvoker.cs
@@ -826,7 +826,7 @@ out ParseMorph morph
 			//       The LexEntry is a variant form and the (non-zero) index indicates
 			//       which set of LexEntryRefs it is for.
 			ICmObject objForm;
-			if (
+			if (String.IsNullOrEmpty(formHvo) ||
 				!cache.ServiceLocator
 					.GetInstance<ICmObjectRepository>()
 					.TryGetObject(int.Parse(formHvo), out objForm)