Adds [return -errorstack] handling + list check for [return -errocode]