Soving issues

why the refactoring? and why don't you return null instead of this fake object?