Properly handle empty diff