Catch null

Fix #504
Merge pull request #505 from bootstraponline/catch_null

Catch null