Eliminate spurious nil components in error paths