null guard
Merge pull request #20 from edx-solutions/api

null guard