Fixed not creating handle if not present