diff --git a/src/api-impl/android/content/Context.java b/src/api-impl/android/content/Context.java
index f6a40a8c..f88c9f65 100644
--- a/src/api-impl/android/content/Context.java
+++ b/src/api-impl/android/content/Context.java
@@ -328,6 +328,11 @@ public class Context extends Object {
 
 	public ComponentName startService(Intent intent) {
 		ComponentName component = intent.getComponent();
+		if(component == null) {
+			Slog.w(TAG, "startService: component is null");
+			return null;
+		}
+
 		try {
 			Class<? extends Service> cls = Class.forName(component.getClassName()).asSubclass(Service.class);
 			if (!runningServices.containsKey(cls)) {
diff --git a/src/api-impl/javax/microedition/khronos/egl/EGLContext.java b/src/api-impl/javax/microedition/khronos/egl/EGLContext.java
index 02bf725e..df7dde8c 100644
--- a/src/api-impl/javax/microedition/khronos/egl/EGLContext.java
+++ b/src/api-impl/javax/microedition/khronos/egl/EGLContext.java
@@ -12,7 +12,7 @@ public class EGLContext {
 	}
 
 	// FIXME - not all GLs are created equal
-	public static GL getGL() {
+	public GL getGL() {
 		return GL_INSTANCE;
 	}