Explicitly check for None (#159)