Add NULLCLIENT support