improved selfUser==null handling