Refactor raising of Construct_failure exceptions and make the