Fixed RollCommand errors

Fixed errors occurring with certain variations of the roll command.