Added inclusion for null just in case