diff --git a/shared/V8ResourceImpl.cpp b/shared/V8ResourceImpl.cpp
index cb0451f5..d8ec373c 100644
--- a/shared/V8ResourceImpl.cpp
+++ b/shared/V8ResourceImpl.cpp
@@ -319,6 +319,14 @@ v8::Local<v8::Object> V8ResourceImpl::GetOrCreateResourceObject(alt::IResource*
     return obj;
 }
 
+void V8ResourceImpl::DeleteResourceObject(alt::IResource* resource)
+{
+    if(resourceObjects.count(resource) == 0) return;
+    v8::Local<v8::Object> obj = resourceObjects.at(resource).Get(isolate);
+    obj->SetInternalField(0, v8::External::New(isolate, nullptr));
+    resourceObjects.erase(resource);
+}
+
 void V8ResourceImpl::InvokeEventHandlers(const alt::CEvent* ev, const std::vector<V8Helpers::EventCallback*>& handlers, std::vector<v8::Local<v8::Value>>& args, bool waitForPromiseResolve)
 {
     for(auto handler : handlers)
diff --git a/shared/V8ResourceImpl.h b/shared/V8ResourceImpl.h
index 02c2fe23..52692603 100644
--- a/shared/V8ResourceImpl.h
+++ b/shared/V8ResourceImpl.h
@@ -230,6 +230,7 @@ class V8ResourceImpl : public alt::IResource::Impl
     }
 
     v8::Local<v8::Object> GetOrCreateResourceObject(alt::IResource* resource);
+    void DeleteResourceObject(alt::IResource* resource);
 
     bool HasBenchmarkTimer(const std::string& name)
     {
diff --git a/shared/bindings/Resource.cpp b/shared/bindings/Resource.cpp
index 470b3f02..5aaa4941 100644
--- a/shared/bindings/Resource.cpp
+++ b/shared/bindings/Resource.cpp
@@ -8,6 +8,7 @@ static void IsStartedGetter(v8::Local<v8::String>, const v8::PropertyCallbackInf
 {
     V8_GET_ISOLATE_CONTEXT();
     V8_GET_THIS_INTERNAL_FIELD_EXTERNAL(1, resource, alt::IResource);
+    V8_CHECK(resource, "Invalid resource");
     V8_RETURN(resource->IsStarted());
 }
 
@@ -15,6 +16,7 @@ static void TypeGetter(v8::Local<v8::String>, const v8::PropertyCallbackInfo<v8:
 {
     V8_GET_ISOLATE_CONTEXT();
     V8_GET_THIS_INTERNAL_FIELD_EXTERNAL(1, resource, alt::IResource);
+    V8_CHECK(resource, "Invalid resource");
     V8_RETURN_STRING(resource->GetType());
 }
 
@@ -22,6 +24,7 @@ static void NameGetter(v8::Local<v8::String>, const v8::PropertyCallbackInfo<v8:
 {
     V8_GET_ISOLATE_CONTEXT();
     V8_GET_THIS_INTERNAL_FIELD_EXTERNAL(1, resource, alt::IResource);
+    V8_CHECK(resource, "Invalid resource");
     V8_RETURN_STRING(resource->GetName());
 }
 
@@ -29,6 +32,7 @@ static void MainGetter(v8::Local<v8::String>, const v8::PropertyCallbackInfo<v8:
 {
     V8_GET_ISOLATE_CONTEXT();
     V8_GET_THIS_INTERNAL_FIELD_EXTERNAL(1, resource, alt::IResource);
+    V8_CHECK(resource, "Invalid resource");
     V8_RETURN_STRING(resource->GetMain());
 }
 
@@ -36,6 +40,7 @@ static void ExportsGetter(v8::Local<v8::String>, const v8::PropertyCallbackInfo<
 {
     V8_GET_ISOLATE_CONTEXT();
     V8_GET_THIS_INTERNAL_FIELD_EXTERNAL(1, resource, alt::IResource);
+    V8_CHECK(resource, "Invalid resource");
     V8_RETURN(V8Helpers::MValueToV8(resource->GetExports()));
 }
 
@@ -43,6 +48,7 @@ static void DependenciesGetter(v8::Local<v8::String>, const v8::PropertyCallback
 {
     V8_GET_ISOLATE_CONTEXT();
     V8_GET_THIS_INTERNAL_FIELD_EXTERNAL(1, resource, alt::IResource);
+    V8_CHECK(resource, "Invalid resource");
 
     const alt::Array<std::string> deps = resource->GetDependencies();
     v8::Local<v8::Array> dependencies = v8::Array::New(isolate, deps.GetSize());
@@ -57,6 +63,7 @@ static void DependantsGetter(v8::Local<v8::String>, const v8::PropertyCallbackIn
 {
     V8_GET_ISOLATE_CONTEXT();
     V8_GET_THIS_INTERNAL_FIELD_EXTERNAL(1, resource, alt::IResource);
+    V8_CHECK(resource, "Invalid resource");
 
     const alt::Array<std::string> deps = resource->GetDependants();
     v8::Local<v8::Array> dependants = v8::Array::New(isolate, deps.GetSize());
@@ -71,6 +78,7 @@ static void RequiredPermissionsGetter(v8::Local<v8::String>, const v8::PropertyC
 {
     V8_GET_ISOLATE_CONTEXT();
     V8_GET_THIS_INTERNAL_FIELD_EXTERNAL(1, resource, alt::IResource);
+    V8_CHECK(resource, "Invalid resource");
 
     const alt::Array<alt::Permission> perms = resource->GetRequiredPermissions();
     v8::Local<v8::Array> permissions = v8::Array::New(isolate, perms.GetSize());
@@ -85,6 +93,7 @@ static void OptionalPermissionsGetter(v8::Local<v8::String>, const v8::PropertyC
 {
     V8_GET_ISOLATE_CONTEXT();
     V8_GET_THIS_INTERNAL_FIELD_EXTERNAL(1, resource, alt::IResource);
+    V8_CHECK(resource, "Invalid resource");
 
     const alt::Array<alt::Permission> perms = resource->GetOptionalPermissions();
     v8::Local<v8::Array> permissions = v8::Array::New(isolate, perms.GetSize());
@@ -100,6 +109,7 @@ static void PathGetter(v8::Local<v8::String>, const v8::PropertyCallbackInfo<v8:
 {
     V8_GET_ISOLATE_CONTEXT();
     V8_GET_THIS_INTERNAL_FIELD_EXTERNAL(1, resource, alt::IResource);
+    V8_CHECK(resource, "Invalid resource");
     V8_RETURN_STRING(resource->GetPath());
 }
 
@@ -107,6 +117,7 @@ static void ConfigGetter(v8::Local<v8::String>, const v8::PropertyCallbackInfo<v
 {
     V8_GET_ISOLATE_CONTEXT();
     V8_GET_THIS_INTERNAL_FIELD_EXTERNAL(1, resource, alt::IResource);
+    V8_CHECK(resource, "Invalid resource");
 
     auto config = resource->GetConfig();
     v8::Local<v8::Value> val = V8Helpers::ConfigNodeToV8(config);
diff --git a/shared/events/Resource.cpp b/shared/events/Resource.cpp
index fc901e79..a10a32df 100644
--- a/shared/events/Resource.cpp
+++ b/shared/events/Resource.cpp
@@ -8,24 +8,21 @@
 
 using EventType = alt::CEvent::Type;
 
-V8_EVENT_HANDLER anyResourceStart(
-  EventType::RESOURCE_START,
-  [](V8ResourceImpl* resource, const alt::CEvent* e) {
-      auto ev = static_cast<const alt::CResourceStartEvent*>(e);
+V8_LOCAL_EVENT_HANDLER anyResourceStart(EventType::RESOURCE_START, "anyResourceStart", [](V8ResourceImpl* resource, const alt::CEvent* e, std::vector<v8::Local<v8::Value>>& args) {
+    auto ev = static_cast<const alt::CResourceStartEvent*>(e);
 
-      return resource->GetLocalHandlers("anyResourceStart");
-  },
-  [](V8ResourceImpl* resource, const alt::CEvent* e, std::vector<v8::Local<v8::Value>>& args) {
-      auto ev = static_cast<const alt::CResourceStartEvent*>(e);
-
-      args.push_back(V8Helpers::JSValue(ev->GetResource()->GetName()));
-  });
+    args.push_back(V8Helpers::JSValue(ev->GetResource()->GetName()));
+});
 
 V8_EVENT_HANDLER anyResourceStop(
   EventType::RESOURCE_STOP,
   [](V8ResourceImpl* resource, const alt::CEvent* e) {
       auto ev = static_cast<const alt::CResourceStopEvent*>(e);
-
+      for(alt::IResource* res : alt::ICore::Instance().GetAllResources())
+      {
+          if(res->GetType() != "js") continue;
+          static_cast<V8ResourceImpl*>(res->GetImpl())->DeleteResourceObject(resource->GetResource());
+      }
       return resource->GetLocalHandlers("anyResourceStop");
   },
   [](V8ResourceImpl* resource, const alt::CEvent* e, std::vector<v8::Local<v8::Value>>& args) {