segfault outputting placeholder

1 files changed, 7 insertions, 6 deletions

diff --git a/moses-cmd/IOWrapper.cpp b/moses-cmd/IOWrapper.cpp
index 177a13403..716274256 100644
--- a/moses-cmd/IOWrapper.cpp
+++ b/moses-cmd/IOWrapper.cpp
@@ -203,15 +203,16 @@ void OutputSurface(std::ostream &out, const Hypothesis &edge, const std::vector<
 
     size_t size = phrase.GetSize();
     for (size_t pos = 0 ; pos < size ; pos++) {
-      const Factor *factor;
+      const Factor *factor = phrase.GetFactor(pos, outputFactorOrder[0]);
 
-      if (placeholderFactor == NOT_FOUND) {
-        factor = phrase.GetFactor(pos, outputFactorOrder[0]);
-      } else {
-        factor = phrase.GetFactor(pos, placeholderFactor);
+      if (placeholderFactor != NOT_FOUND) {
+    	  const Factor *origFactor = phrase.GetFactor(pos, placeholderFactor);
+    	  if (origFactor) {
+    		  factor = origFactor;
+    	  }
       }
-      out << *factor;
       CHECK(factor);
+      out << *factor;
 
       for (size_t i = 1 ; i < outputFactorOrder.size() ; i++) {
         const Factor *factor = phrase.GetFactor(pos, outputFactorOrder[i]);