Fix for null activity values coming from DB.