Added Error handling & fix