fix panic on nil, temporarily, closes #64