Added validation to return and notify actions