Cleaned up handleError
Increase the number of shards