added missing error handling for several actions