minor #69 do not count on null (xabbuh)
minor #69 do not count on null (xabbuh)

This PR was merged into the 2.x branch.

Discussion
----------

do not count on null

Commits
-------

1d708d8 do not count on null

php-xapi/model