Added warning name service
Fixes