Add better error. Update bundle