Option A, provided that it is a legitimate mistake and is something that's required in order for the action to continue.
If someone forgets a psychic test and rolls for the rest of the effects, they stand once he's made the test.
There would be exceptions, though. If someone has rolled armour saves before I've started to roll to wound, then they have to be re-rolled after I've actually checked to see how many have been wounded.
Or, if they've rolled a 4+ to wound but accidentally thought it was 3+ and have already started to pick up the dice, it's often best to get them to roll the dice again unless we're both sure that the person has only picked up the right dice.
So, in other words: Option A, with a lot of "ifs" and "buts"