Fixed wrong error message in lockdown. Fixes #1579
Merge branch 'master' into workshop