Backport a user-error check in order to satisfy a test.
Fix long range dependency in tests for hotfix (revert this in Develop)