Add Exception and fix requests