Add completion check against nil value