Code pattern. Move error code into conditional scope
Comment fixes