Fix possible notices when data isn't correctly stored