Fixed diff crash for newly created instance in a cleaner way.