You could add a few @Nullable annotations to your code where you might return null and be completely null-safe. Nullness is a so-called trivial property, so it

You could add a few @Nullable annotations to your code where you might return null and be completely null-safe. Nullness is a so-called trivial property, so it can be statically analyised even in such a bolted on way.