Set obj to NULL if not found, to make bugs easier to find (failfast)
Some morning programming
A bit more and ready for unit tests