Bug 1055456 - Handle node env messages better