Feature/safeguards for deferred initialization