#9: fix optional but null check only