Merge "Make error handling kill context activity. Add parameter validation." into klp-dev