Re-introduced the test for the existence of the current pipe and correcte a comment.
Authored by: semor 2008-04-04
Parent: [r5309]
Child: [r5311]
