Add Logger & some error checking msgs