Fix NPE for dumb users