Small improvements in Error handling mostly