Update comments
Make handler resistant to failure