MCP: all elements of the if cascade share the error handling so I moved it out after the cascade
MCP: all elements of the if cascade share the error handling so I moved it out after the cascade

csdb/Tapper-MCP,tapper/Tapper-MCP,csdb/Tapper-MCP,tapper/Tapper-MCP