Fixed wrong handling of unsupported metadata