Add : null check after fetch