update for null exception