correct a possible bug in last commit

When reading last commit, it appeared to me that there would be a crash
if y was null.
So I restored the non cleaned up code.