Killed bugs and Altered ID master
Add try catch