diff --git a/src/com/android/settings/VoiceInputOutputSettings.java b/src/com/android/settings/VoiceInputOutputSettings.java
index 87e423c..30bedda 100644
--- a/src/com/android/settings/VoiceInputOutputSettings.java
+++ b/src/com/android/settings/VoiceInputOutputSettings.java
@@ -24,6 +24,8 @@
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.content.pm.ServiceInfo;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.content.res.XmlResourceParser;
 import android.os.Bundle;
@@ -164,6 +166,9 @@
                         " meta-data for " + si.packageName);
             }
             
+            Resources res = getPackageManager().getResourcesForApplication(
+                    si.applicationInfo);
+            
             AttributeSet attrs = Xml.asAttributeSet(parser);
             
             int type;
@@ -177,7 +182,7 @@
                         "Meta-data does not start with recognition-service tag");
             }
             
-            TypedArray array = getResources().obtainAttributes(attrs,
+            TypedArray array = res.obtainAttributes(attrs,
                     com.android.internal.R.styleable.RecognitionService);
             settingsActivity = array.getString(
                     com.android.internal.R.styleable.RecognitionService_settingsActivity);
@@ -186,6 +191,8 @@
             Log.e(TAG, "error parsing recognition service meta-data", e);
         } catch (IOException e) {
             Log.e(TAG, "error parsing recognition service meta-data", e);
+        } catch (NameNotFoundException e) {
+            Log.e(TAG, "error parsing recognition service meta-data", e);
         } finally {
             if (parser != null) parser.close();
         }
