Added simple nullguard