Make sure we do not try to convert None