Added check for nil Maker in SetComponent()