Additional improvement of pip behaviour

Avoids possible GSOD, Thanks Dima74