Added not found checks for all save actions