null check
Merge pull request #237 from jay-hodgson/small-api-table-fix

null check