Respect $catch argument in handle()
CS fixes
Merge pull request #6027 from jsor/application-handle-catch-arg

[4.2] Respect $catch Argument In handle()
Fix conflicts.