Added case to catch null

https://github.com/kfgodel/diamond/issues/39