Done. I've also updated the tests to check if `null` is returned at all.