Make handler more failure resistant
New version