Bug fix for parse null reference when re-opening