Added initialization check