add logic around None results