fix: check using isset instead of !== null for possibly non-existent …#127