Re-instating original intent of null check.