diff --git a/src/vu8/Class.hpp b/src/vu8/Class.hpp
index 7159ad4..c26a5b9 100644
--- a/src/vu8/Class.hpp
+++ b/src/vu8/Class.hpp
@@ -158,8 +158,8 @@ class ClassSingleton
     v8::Persistent<v8::FunctionTemplate> func_;
 
     friend class detail::LazySingleton<self>;
-    friend class Class<T, Factory>;
-    friend class Singleton<T>;
+    friend struct Class<T, Factory>;
+    friend struct Singleton<T>;
 };
 
 // Interface for registering C++ classes with v8
@@ -248,7 +248,7 @@ struct Class {
     }
     Class() {}
 
-    friend class Singleton<T>;
+    friend struct Singleton<T>;
 };
 
 // Wrap a C++ singleton
diff --git a/src/vu8/detail/FromV8.hpp b/src/vu8/detail/FromV8.hpp
index f9bbe70..152072c 100644
--- a/src/vu8/detail/FromV8.hpp
+++ b/src/vu8/detail/FromV8.hpp
@@ -149,8 +149,12 @@ struct FromV8<ValueHandle> : FromV8Base<ValueHandle> {
 template <class T>
 struct FromV8Ptr : FromV8Base<T> {
     static inline T exec(ValueHandle value) {
-        if (! value->IsObject())
+        if (! value->IsObject()) {
+            if (value->IsNull()) {
+                return NULL;
+            }
             throw std::runtime_error("expected object");
+        }
 
         v8::Local<v8::Object> obj = value->ToObject();