refactor: Export key, more checks for nil, remove redundant check

refactor: Export key, more checks for nil, remove redundant check #204