DW: Added a check for the submission key

Closes #627
Nice, never seen the bottom 2 before, if i don't get an even cleaner one i will go with third