DW: Added a check for the submission key

Closes #627