Issue 3515843: Added check to make sure of type matches.

Michael Palmerrequested to merge
issue/workbench_email-3515843:3515843-error-when-trash into 3.x

Closes #3515843

Merge request reports