Adds check support for handle: false