removed pipe null; adjusted condition;