re-added the null check...