adjust stages executing for new error handling method