add return on errors