bugfix off-def_link
error handling