Structurmap catch expanded