Added another safety net