Change behavior of generic function to handle None results as expected.