Fixes #61 and makes sure user does not see "null"