This needs a null check too.