Prevent crashes on conflicts