This should be above the client initialiser with the other variable checks