Add null check on Get