APP-571 Schedule API and exception tweaks