some code cleanup, ensure response always passed to app finished event