diff --git a/intern/cycles/blender/blender_python.cpp b/intern/cycles/blender/blender_python.cpp
index fbc88f1056f..e78c78e5eb2 100644
--- a/intern/cycles/blender/blender_python.cpp
+++ b/intern/cycles/blender/blender_python.cpp
@@ -284,6 +284,8 @@ static PyObject *osl_update_node_func(PyObject *self, PyObject *args)
 				if(param->validdefault)
 					default_string = param->sdefault[0];
 			}
+			else
+				continue;
 		}
 		else
 			continue;
diff --git a/intern/cycles/render/scene.cpp b/intern/cycles/render/scene.cpp
index a2febc31f60..7834aa701ea 100644
--- a/intern/cycles/render/scene.cpp
+++ b/intern/cycles/render/scene.cpp
@@ -44,6 +44,10 @@ Scene::Scene(const SceneParams& params_, const DeviceInfo& device_info_)
 	device = NULL;
 	memset(&dscene.data, 0, sizeof(dscene.data));
 
+	/* OSL only works on the CPU */
+	if(device_info_.type != DEVICE_CPU)
+		params.shadingsystem = SceneParams::SVM;
+
 	camera = new Camera();
 	filter = new Filter();
 	film = new Film();