Added mass-assignment protection to instantiation