fixed nil and current_requests issues