check for null, closes #62