Patches
Plain Diff
Instead of PHP error + crash, use an Exception and catch it in management to show it to the user and cancel the operation. issue #6032