diff --git a/api.php b/api.php
index ef3ff7e..89952c2 100644
--- a/api.php
+++ b/api.php
@@ -14,7 +14,7 @@ $python="/usr/bin/python";
 require_once 'download.php';
 if (isset($_GET["url"])) {
     if (isset($_GET["format"]) || isset($_GET['audio'])) {
-        $video = json_decode(VideoDownload::getJSON($_GET["url"], $_GET["format"]));
+        $video = VideoDownload::getJSON($_GET["url"], $_GET["format"]);
         
         if (isset($video->url)) {
             //Vimeo needs a correct user-agent
@@ -124,7 +124,7 @@ if (isset($_GET["url"])) {
             $error=true;
         }
     } else {
-        $video = json_decode(VideoDownload::getJSON($_GET["url"]));
+        $video = VideoDownload::getJSON($_GET["url"]);
         if (isset($video->webpage_url)) {
             include 'head.php';
             ?>
diff --git a/download.php b/download.php
index 9126f78..2c8c9d6 100644
--- a/download.php
+++ b/download.php
@@ -124,12 +124,16 @@ Class VideoDownload
         if (isset($format)) {
             $cmd .= ' -f '.escapeshellarg($format);
         }
-        $cmd .=' --dump-json '.escapeshellarg($url);
+        $cmd .=' --dump-json '.escapeshellarg($url)." 2>&1";
         exec(
             $cmd,
-            $json
+            $json, $code
         );
-        return $json[0];
+	if ($code>0) {
+            return array('success'=>false, 'error'=>$json);
+        } else {
+            return json_decode($json[0]);
+        }
     }
 
     /**