I've added an extra check for the gradient ( I used to have it in my branch,
because I think at one point I got an error because of that, though I'm not
100% sure we should need to do that check).