Return / Error handling in find made better
set/define working