Except return 0 if using the -u argument. Bug introduced by addb3574,
fix bug 2330 differently while solving bug 2807.