From f2f07700e233daf07be2c1d9fdf943f0c1b7bb89 Mon Sep 17 00:00:00 2001
From: "St.Spyder" <stspyder@users.noreply.github.com>
Date: Tue, 2 Feb 2016 02:08:46 +0530
Subject: [PATCH] Throw type error on converting non objects to sequence, Don't
 panic in case of JS error

---
 src/conversions.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/conversions.rs b/src/conversions.rs
index 1ce5714e1c8b9..e794ae804394c 100644
--- a/src/conversions.rs
+++ b/src/conversions.rs
@@ -499,6 +499,7 @@ impl<C: Clone, T: FromJSValConvertible<Config=C>> FromJSValConvertible for Vec<T
         let mut length = 0;
 
         if !value.is_object() {
+            throw_type_error(cx, "Non objects cannot be converted to sequence");
             return Err(())
         }
 
@@ -508,7 +509,10 @@ impl<C: Clone, T: FromJSValConvertible<Config=C>> FromJSValConvertible for Vec<T
 
             for i in 0..length {
                 let mut val = RootedValue::new(cx, UndefinedValue());
-                assert!(JS_GetElement(cx, obj.handle(), i, val.handle_mut()));
+                if !JS_GetElement(cx, obj.handle(), i, val.handle_mut()) {
+                    // On JS Exception return Err
+                    return Err(());
+                }
                 ret.push(try!(T::from_jsval(cx, val.handle(), option.clone())));
             }