Merge "Add param null-check + error return"
diff --git a/libs/vr/libvrflinger/vr_flinger.cpp b/libs/vr/libvrflinger/vr_flinger.cpp
index 07f36a4..82ce067 100644
--- a/libs/vr/libvrflinger/vr_flinger.cpp
+++ b/libs/vr/libvrflinger/vr_flinger.cpp
@@ -32,6 +32,9 @@
 VrFlinger::VrFlinger() {}
 
 int VrFlinger::Run(Hwc2::Composer* hidl) {
+  if (!hidl)
+    return EINVAL;
+
   std::shared_ptr<android::pdx::Service> service;
 
   ALOGI("Starting up VrFlinger...");