Restructuring, Rate Limit Error catching