Preparation for SRB Gerrit review

Please use this PR for review, or the branch to push any changes.

We'll squash any commits later on into 2 target commits.
You are doing this check also in the __init__() method. But it doesn't hurt and I am also relieved when I see a proper "else" clause.