Merge "Fix NPE if default supervisor is not defined"