Return false instead of null

This should fixes #330