Fixed issue #645: Context menu diff crashes/errors