A little Richer API

Avoiding null !!