diff --git a/dist/twist/Core/Resources/twist/fileupload/js/twistfileupload.js b/dist/twist/Core/Resources/twist/fileupload/js/twistfileupload.js
index 6a784756..c9ef96c2 100755
--- a/dist/twist/Core/Resources/twist/fileupload/js/twistfileupload.js
+++ b/dist/twist/Core/Resources/twist/fileupload/js/twistfileupload.js
@@ -405,19 +405,23 @@
 
 						for( var intFileDetail in arrFileDetails ) {
 							var strFileDetail = arrFileDetails[intFileDetail],
-									strProperty = objUploadedFile[strFileDetail];
+									strProperty;
 
 							if( strFileDetail.indexOf( '/' ) !== -1 ) {
 								var arrDelve = strFileDetail.split( '/' ),
-										objToDelve = objUploadedFile[arrDelve[0]];
+										objToDelve = objUploadedFile[arrDelve[0]] || null;
 
 								arrDelve.shift();
 
-								for( var intKeyPart in arrDelve ) {
-									objToDelve = objToDelve[arrDelve[intKeyPart]];
-								}
+								if( objToDelve ) {
+									for( var intKeyPart in arrDelve ) {
+										objToDelve = objToDelve[arrDelve[intKeyPart]] || null;
+									}
 
-								strProperty = objToDelve;
+									strProperty = objToDelve || null;
+								}
+							} else {
+								strProperty = objUploadedFile[strFileDetail] || null;
 							}
 
 							strFileDetails += '<li data-key="' + strFileDetail + '"><span>' + strFileDetail.replace( /[\/_]/g, ' ' ) + ' :</span>' + strProperty + '</li>';
diff --git a/dist/twist/Core/Resources/twist/fileupload/js/twistfileupload.min.js b/dist/twist/Core/Resources/twist/fileupload/js/twistfileupload.min.js
index 2910f63c..e640a1ac 100755
--- a/dist/twist/Core/Resources/twist/fileupload/js/twistfileupload.min.js
+++ b/dist/twist/Core/Resources/twist/fileupload/js/twistfileupload.min.js
@@ -48,4 +48,4 @@
 			 * @version 1.0.0
 			 * @license GPL-3.0
 			 */
-var e=function(e,t,o){var n=!0,s=function(e,t,o){(n||o===!0)&&window.console&&(window.console[t]?window.console[t](e):window.console.log&&console.log(e))},u=function(e,t){return e.className.indexOf(t)!==-1},r=function(e,t){u(e,t)||(e.className+=" "+t)},i=function(e,t){u(e,t)&&(e.className=e.className.replace(new RegExp("^"+t+"$","g"),"").replace(new RegExp("^"+t+" ","g"),"").replace(new RegExp(" "+t+"$","g"),"").replace(new RegExp(" "+t+" ","g")," "))},a=function(e){for(var t=["B","kB","MB","GB","TB","PB","EB","ZB","YB"],o=0;t[o]&&e>Math.pow(1024,o+1);)o++;return d(e/Math.pow(1024,o),o>1?2:0)+t[o]},d=function(e,t){return t="number"!=typeof t?0:t,0===t?parseInt(Math.round(e*Math.pow(10,t))/Math.pow(10,t)):parseFloat(Math.round(e*Math.pow(10,t))/Math.pow(10,t))},l="string"==typeof(new XMLHttpRequest).responseType&&"withCredentials"in new XMLHttpRequest;if(l){var p=new XMLHttpRequest;p.open("GET","/");try{p.responseType="arraybuffer"}catch(c){l=!1}}var m=this;this.acceptExtentions=[],this.acceptRaw=[],this.acceptTypes=[],this.addRemoveFileListener=function(){var t=function(e){return function(){console.log("Remove"),m.removeFileFromListFunction(e)}};for(var o in m.uploaded){var n=document.getElementById(e+"-remove-"+o);n.removeEventListener("click",t(o)),n.addEventListener("click",t(o))}},this.created=(new Date).getTime(),this.cancelUpload=function(){m.request.abort()},this.clearInput=function(){m.domInput.value="",m.domInput.value&&(m.domInput.type="text",m.domInput.type="file"),m.domPseudo.value="",m.settings.onclear()},this.domCancelUpload=document.getElementById(e+"-cancel"),this.domCancelUploadDisplay=null,this.domCount=document.getElementById(e+"-count"),this.domCountWrapper=document.getElementById(e+"-count-wrapper"),this.domCountWrapperDisplay=null,this.domCountTotal=document.getElementById(e+"-total"),this.domInput=document.getElementById(e),this.domInputDisplay=null,this.domList=document.getElementById(e+"-list"),this.domProgress=document.getElementById(e+"-progress"),this.domProgressWrapper=document.getElementById(e+"-progress-wrapper"),this.domPseudo=document.getElementById(e+"-pseudo"),this.hideProgress=function(){m.domInput&&(m.domInput.style.display=m.domInputDisplay),m.domProgressWrapper&&(m.domProgressWrapper.style.display="none"),m.domCancelUpload&&m.domCancelUpload.removeEventListener("click",m.cancelUpload)},this.multiple=m.domInput&&m.domInput.hasAttribute("multiple")||!1,this.queue=[],this.queueCount=0,this.queueSize=0,this.queueUploadedCount=0,this.queueUploadedSize=0,this.removeFileFromListFunction=function(e){m.uploaded.splice(e,1),m.updateUploadedList()},this.request=new XMLHttpRequest,this.settings={abortable:!0,counter:!0,debug:!1,dragdrop:null,dropableclass:"twistupload-dropable",hoverclass:"twistupload-hover",invalidtypemessage:"This file type is not permitted",onabort:function(){},onclear:function(){},oncompletefile:function(){},oncompletequeue:function(){},onerror:function(){},oninvalidtype:function(){},onprogress:function(){},onstart:function(){},previewsize:128,previewsquare:!0},this.showProgress=function(){m.domInput.style.display="none",m.domProgressWrapper&&(m.domProgressWrapper.style.display=m.domInputDisplay),m.domCancelUpload&&m.domCancelUpload.addEventListener("click",m.cancelUpload)},this.supported=!1,this.uid=e,this.updateUploadedList=function(){var t="",o=[];for(var n in m.uploaded){var s=m.uploaded[n],u=s.uri_preview,r="",i=["file/name","file/size","file_type"];o.push(s.form_value);var a="thumb-"+m.settings.previewsize;m.settings.previewsquare&&(a="square-"+a),s.support&&s.support[a]&&(u=s.support[a]);for(var d in i){var l=i[d],p=s[l];if(l.indexOf("/")!==-1){var c=l.split("/"),g=s[c[0]];c.shift();for(var f in c)g=g[c[f]];p=g}r+='<li data-key="'+l+'"><span>'+l.replace(/[\/_]/g," ")+" :</span>"+p+"</li>"}t+='<li class="twistupload-file-list-item"><img src="'+u+'"><ul class="twistupload-file-info">'+r+'</ul><button id="'+e+"-remove-"+n+'" data-file="'+n+'">Remove</button></li>'}m.domPseudo.value=o.join(","),m.domList.innerHTML=t,m.addRemoveFileListener()},this.upload=function(e,t){try{if(e){var o=t?t:(e.target||e.srcElement).files;m.queue.push.apply(m.queue,o),m.queueCount+=o.length;for(var n=0,u=o.length;n<u;n++)m.queueSize+=parseInt(o[n].size);m.domCountTotal&&(m.domCountTotal.innerText=m.queueCount),s("Added "+o.length+" files to the queue","info")}if(null===m.domCancelUploadDisplay&&(m.domCancelUploadDisplay=m.domCancelUpload.style.display||"inline-block"),null===m.domCountWrapperDisplay&&(m.domCountWrapperDisplay=m.domCountWrapper.style.display||"inline-block"),null===m.domInputDisplay&&(m.domInputDisplay=m.domInput.style.display||"inline-block"),m.queue.length){var r=m.queue[0],i=r.name,d=r.type,l=i.substr(i.lastIndexOf(".")+1).toLowerCase(),p=parseInt(r.size),c=new FileReader({blob:!0}),g=!m.acceptTypes.length&&!m.acceptExtentions.length;if(!g)for(var f in m.acceptTypes)if(new RegExp("^"+m.acceptTypes[f]+"$","gi").test(d)){g=!0;break}if(!g)for(var h in m.acceptExtentions)if(l===m.acceptExtentions[h]){g=!0;break}if(g)m.settings.onstart(r),m.showProgress(),m.domCount&&(m.domCount.innerText=m.queueUploadedCount+1),1===m.queueCount?(m.domProgress&&m.domProgress.removeAttribute("value"),m.domCountWrapper&&(m.domCountWrapper.style.display="none")):m.domCountWrapper&&(m.domCountWrapper.style.display=m.domCountWrapperDisplay),c.addEventListener("load",function(e){m.request.onreadystatechange=function(){switch(m.request.status){case 200:if(4==m.request.readyState){s("Uploaded "+i+" ("+a(p)+")"),m.queue.shift(),m.queueUploadedCount++,m.queueUploadedSize+=p;var e=JSON.parse(m.request.responseText);m.queue.length?(m.multiple?m.uploaded.push(e):m.uploaded=[e.form_value],m.updateUploadedList(),window.twistdebug&&window.twistdebug.logFileUpload(r,e),m.settings.oncompletefile(e,r),m.upload()):(m.hideProgress(),s("Finsihed uploading "+m.queueUploadedCount+" files ("+a(m.queueUploadedSize)+")","info"),m.queueCount=0,m.queueSize=0,m.queueUploadedCount=0,m.queueUploadedSize=0,m.clearInput(),m.multiple?m.uploaded.push(e):m.uploaded=[e],m.updateUploadedList(),window.twistdebug&&window.twistdebug.logFileUpload(r,e),m.settings.oncompletefile(e,r),m.settings.oncompletequeue())}break;case 403:s("Permission denied","error"),m.queue.shift(),m.queueCount--,m.queueSize--,m.settings.onerror(r),m.queue.length?m.upload():m.hideProgress();break;case 404:s("Invalid function call","error"),m.queue.shift(),m.queueCount--,m.queueSize--,m.settings.onerror(r),m.queue.length?m.upload():m.hideProgress()}},m.request.onprogress=function(e){if(e.lengthComputable){if(m.domProgress){var t=Math.round(e.loaded/e.total*100);m.domProgress.value=t,s(a(e.loaded)+"/"+a(e.total)+" ("+t+"%)")}m.settings.onprogress(r,e.loaded,e.total)}},m.request.upload.onprogress=m.request.onprogress,m.request.addEventListener("load",function(){},!1),m.request.addEventListener("error",function(){m.queue.length&&(m.hideProgress(),m.queue=[],m.queueCount=0,m.queueSize=0,m.queueUploadedCount=0,m.queueUploadedSize=0,m.settings.onerror(r),s("An error occurred","error"))},!1),m.request.addEventListener("abort",function(){m.queue.length&&(m.hideProgress(),m.queue=[],m.queueCount=0,m.queueSize=0,m.queueUploadedCount=0,m.queueUploadedSize=0,m.settings.onabort(r),s("Upload aborted","warning"))},!1),m.request.open("PUT",m.uri,!0),m.request.setRequestHeader("Accept",'"text/plain; charset=iso-8859-1", "Content-Type": "text/plain; charset=iso-8859-1"'),m.request.setRequestHeader("Twist-File",i),m.request.setRequestHeader("Twist-Length",p),m.request.setRequestHeader("Twist-UID",m.uid),m.request.send(c.result)}),c.readAsArrayBuffer(r);else{var q=m.queue.shift();m.domInput.value="",m.settings.oninvalidtype(q,m.acceptTypes,m.acceptExtentions),s(i+" ("+d+") is not in the list of allowed types","warn"),m.acceptTypes.length&&s("Allowed MIME types: "+m.acceptTypes.join(", ")),m.acceptExtentions.length&&s("Allowed file extensions: "+m.acceptExtentions.join(", ")),alert(m.settings.invalidtypemessage),m.clearInput()}}}catch(v){m.hideProgress(),m.settings.onerror(m.queue[0]),m.settings.onabort(m.queue[0]),m.queue=[],m.queueCount=0,m.queueSize=0,m.queueUploadedCount=0,m.queueUploadedSize=0,s(v,"error")}},this.uploaded=[],this.uri="/"+t.replace(/^\//,"").replace(/\/$/,"");for(var g in o)m.settings[g]=o[g];if(m.domPseudo&&m.domPseudo.value&&""!==m.domPseudo.value&&(m.uploaded=m.domPseudo.value.split(",")||[]),n=m.settings.debug===!0,m.domCountWrapper&&!m.settings.counter&&(m.domCountWrapper.style.display="none"),m.domCancelUpload&&!m.settings.abortable&&(m.domCancelUpload.style.display="none"),m.hideProgress(),null!==m.settings.dragdrop){var f=document.getElementById(m.settings.dragdrop);f&&(f.ondrop=function(e){e.preventDefault(),m.upload(e,e.target.files||e.dataTransfer.files),i(f,m.settings.hoverclass),i(f,m.settings.dropableclass)},f.ondragstart=function(){return r(f,m.settings.dropableclass),!1},f.ondragover=function(){return r(f,m.settings.hoverclass),!1},f.ondragleave=function(){return i(f,m.settings.hoverclass),!1},f.ondragend=function(){return i(f,m.settings.hoverclass),i(f,m.settings.dropableclass),!1})}var h=m.domInput?m.domInput.getAttribute("accept"):"";if(h){var q=h.replace(/ /g,"").split(",");if(q.length)for(var v in q)"."===q[v].substr(0,1)?m.acceptExtentions.push(q[v].substr(1).toLowerCase()):m.acceptTypes.push(q[v].replace(/\//g,"\\/").replace(/\*/g,".*")),m.acceptRaw.push(q[v])}if(!l)return m.hideProgress(),s("Your browser does not support AJAX uploading","warn",!0),null;if(!m.domInput)throw'No element exists with id="'+e+'"';return m.domPseudo&&(m.domPseudo.name=m.domInput.name.replace("[]",""),m.domInput.removeAttribute("name")),m.domInput.addEventListener("change",m.upload),!0};return function(t,o,n){return new e(t,o,n)}});
\ No newline at end of file
+var e=function(e,t,o){var n=!0,s=function(e,t,o){(n||o===!0)&&window.console&&(window.console[t]?window.console[t](e):window.console.log&&console.log(e))},u=function(e,t){return e.className.indexOf(t)!==-1},r=function(e,t){u(e,t)||(e.className+=" "+t)},i=function(e,t){u(e,t)&&(e.className=e.className.replace(new RegExp("^"+t+"$","g"),"").replace(new RegExp("^"+t+" ","g"),"").replace(new RegExp(" "+t+"$","g"),"").replace(new RegExp(" "+t+" ","g")," "))},a=function(e){for(var t=["B","kB","MB","GB","TB","PB","EB","ZB","YB"],o=0;t[o]&&e>Math.pow(1024,o+1);)o++;return l(e/Math.pow(1024,o),o>1?2:0)+t[o]},l=function(e,t){return t="number"!=typeof t?0:t,0===t?parseInt(Math.round(e*Math.pow(10,t))/Math.pow(10,t)):parseFloat(Math.round(e*Math.pow(10,t))/Math.pow(10,t))},d="string"==typeof(new XMLHttpRequest).responseType&&"withCredentials"in new XMLHttpRequest;if(d){var p=new XMLHttpRequest;p.open("GET","/");try{p.responseType="arraybuffer"}catch(c){d=!1}}var m=this;this.acceptExtentions=[],this.acceptRaw=[],this.acceptTypes=[],this.addRemoveFileListener=function(){var t=function(e){return function(){console.log("Remove"),m.removeFileFromListFunction(e)}};for(var o in m.uploaded){var n=document.getElementById(e+"-remove-"+o);n.removeEventListener("click",t(o)),n.addEventListener("click",t(o))}},this.created=(new Date).getTime(),this.cancelUpload=function(){m.request.abort()},this.clearInput=function(){m.domInput.value="",m.domInput.value&&(m.domInput.type="text",m.domInput.type="file"),m.domPseudo.value="",m.settings.onclear()},this.domCancelUpload=document.getElementById(e+"-cancel"),this.domCancelUploadDisplay=null,this.domCount=document.getElementById(e+"-count"),this.domCountWrapper=document.getElementById(e+"-count-wrapper"),this.domCountWrapperDisplay=null,this.domCountTotal=document.getElementById(e+"-total"),this.domInput=document.getElementById(e),this.domInputDisplay=null,this.domList=document.getElementById(e+"-list"),this.domProgress=document.getElementById(e+"-progress"),this.domProgressWrapper=document.getElementById(e+"-progress-wrapper"),this.domPseudo=document.getElementById(e+"-pseudo"),this.hideProgress=function(){m.domInput&&(m.domInput.style.display=m.domInputDisplay),m.domProgressWrapper&&(m.domProgressWrapper.style.display="none"),m.domCancelUpload&&m.domCancelUpload.removeEventListener("click",m.cancelUpload)},this.multiple=m.domInput&&m.domInput.hasAttribute("multiple")||!1,this.queue=[],this.queueCount=0,this.queueSize=0,this.queueUploadedCount=0,this.queueUploadedSize=0,this.removeFileFromListFunction=function(e){m.uploaded.splice(e,1),m.updateUploadedList()},this.request=new XMLHttpRequest,this.settings={abortable:!0,counter:!0,debug:!1,dragdrop:null,dropableclass:"twistupload-dropable",hoverclass:"twistupload-hover",invalidtypemessage:"This file type is not permitted",onabort:function(){},onclear:function(){},oncompletefile:function(){},oncompletequeue:function(){},onerror:function(){},oninvalidtype:function(){},onprogress:function(){},onstart:function(){},previewsize:128,previewsquare:!0},this.showProgress=function(){m.domInput.style.display="none",m.domProgressWrapper&&(m.domProgressWrapper.style.display=m.domInputDisplay),m.domCancelUpload&&m.domCancelUpload.addEventListener("click",m.cancelUpload)},this.supported=!1,this.uid=e,this.updateUploadedList=function(){var t="",o=[];for(var n in m.uploaded){var s=m.uploaded[n],u=s.uri_preview,r="",i=["file/name","file/size","file_type"];o.push(s.form_value);var a="thumb-"+m.settings.previewsize;m.settings.previewsquare&&(a="square-"+a),s.support&&s.support[a]&&(u=s.support[a]);for(var l in i){var d,p=i[l];if(p.indexOf("/")!==-1){var c=p.split("/"),g=s[c[0]]||null;if(c.shift(),g){for(var f in c)g=g[c[f]]||null;d=g||null}}else d=s[p]||null;r+='<li data-key="'+p+'"><span>'+p.replace(/[\/_]/g," ")+" :</span>"+d+"</li>"}t+='<li class="twistupload-file-list-item"><img src="'+u+'"><ul class="twistupload-file-info">'+r+'</ul><button id="'+e+"-remove-"+n+'" data-file="'+n+'">Remove</button></li>'}m.domPseudo.value=o.join(","),m.domList.innerHTML=t,m.addRemoveFileListener()},this.upload=function(e,t){try{if(e){var o=t?t:(e.target||e.srcElement).files;m.queue.push.apply(m.queue,o),m.queueCount+=o.length;for(var n=0,u=o.length;n<u;n++)m.queueSize+=parseInt(o[n].size);m.domCountTotal&&(m.domCountTotal.innerText=m.queueCount),s("Added "+o.length+" files to the queue","info")}if(null===m.domCancelUploadDisplay&&(m.domCancelUploadDisplay=m.domCancelUpload.style.display||"inline-block"),null===m.domCountWrapperDisplay&&(m.domCountWrapperDisplay=m.domCountWrapper.style.display||"inline-block"),null===m.domInputDisplay&&(m.domInputDisplay=m.domInput.style.display||"inline-block"),m.queue.length){var r=m.queue[0],i=r.name,l=r.type,d=i.substr(i.lastIndexOf(".")+1).toLowerCase(),p=parseInt(r.size),c=new FileReader({blob:!0}),g=!m.acceptTypes.length&&!m.acceptExtentions.length;if(!g)for(var f in m.acceptTypes)if(new RegExp("^"+m.acceptTypes[f]+"$","gi").test(l)){g=!0;break}if(!g)for(var h in m.acceptExtentions)if(d===m.acceptExtentions[h]){g=!0;break}if(g)m.settings.onstart(r),m.showProgress(),m.domCount&&(m.domCount.innerText=m.queueUploadedCount+1),1===m.queueCount?(m.domProgress&&m.domProgress.removeAttribute("value"),m.domCountWrapper&&(m.domCountWrapper.style.display="none")):m.domCountWrapper&&(m.domCountWrapper.style.display=m.domCountWrapperDisplay),c.addEventListener("load",function(e){m.request.onreadystatechange=function(){switch(m.request.status){case 200:if(4==m.request.readyState){s("Uploaded "+i+" ("+a(p)+")"),m.queue.shift(),m.queueUploadedCount++,m.queueUploadedSize+=p;var e=JSON.parse(m.request.responseText);m.queue.length?(m.multiple?m.uploaded.push(e):m.uploaded=[e.form_value],m.updateUploadedList(),window.twistdebug&&window.twistdebug.logFileUpload(r,e),m.settings.oncompletefile(e,r),m.upload()):(m.hideProgress(),s("Finsihed uploading "+m.queueUploadedCount+" files ("+a(m.queueUploadedSize)+")","info"),m.queueCount=0,m.queueSize=0,m.queueUploadedCount=0,m.queueUploadedSize=0,m.clearInput(),m.multiple?m.uploaded.push(e):m.uploaded=[e],m.updateUploadedList(),window.twistdebug&&window.twistdebug.logFileUpload(r,e),m.settings.oncompletefile(e,r),m.settings.oncompletequeue())}break;case 403:s("Permission denied","error"),m.queue.shift(),m.queueCount--,m.queueSize--,m.settings.onerror(r),m.queue.length?m.upload():m.hideProgress();break;case 404:s("Invalid function call","error"),m.queue.shift(),m.queueCount--,m.queueSize--,m.settings.onerror(r),m.queue.length?m.upload():m.hideProgress()}},m.request.onprogress=function(e){if(e.lengthComputable){if(m.domProgress){var t=Math.round(e.loaded/e.total*100);m.domProgress.value=t,s(a(e.loaded)+"/"+a(e.total)+" ("+t+"%)")}m.settings.onprogress(r,e.loaded,e.total)}},m.request.upload.onprogress=m.request.onprogress,m.request.addEventListener("load",function(){},!1),m.request.addEventListener("error",function(){m.queue.length&&(m.hideProgress(),m.queue=[],m.queueCount=0,m.queueSize=0,m.queueUploadedCount=0,m.queueUploadedSize=0,m.settings.onerror(r),s("An error occurred","error"))},!1),m.request.addEventListener("abort",function(){m.queue.length&&(m.hideProgress(),m.queue=[],m.queueCount=0,m.queueSize=0,m.queueUploadedCount=0,m.queueUploadedSize=0,m.settings.onabort(r),s("Upload aborted","warning"))},!1),m.request.open("PUT",m.uri,!0),m.request.setRequestHeader("Accept",'"text/plain; charset=iso-8859-1", "Content-Type": "text/plain; charset=iso-8859-1"'),m.request.setRequestHeader("Twist-File",i),m.request.setRequestHeader("Twist-Length",p),m.request.setRequestHeader("Twist-UID",m.uid),m.request.send(c.result)}),c.readAsArrayBuffer(r);else{var q=m.queue.shift();m.domInput.value="",m.settings.oninvalidtype(q,m.acceptTypes,m.acceptExtentions),s(i+" ("+l+") is not in the list of allowed types","warn"),m.acceptTypes.length&&s("Allowed MIME types: "+m.acceptTypes.join(", ")),m.acceptExtentions.length&&s("Allowed file extensions: "+m.acceptExtentions.join(", ")),alert(m.settings.invalidtypemessage),m.clearInput()}}}catch(v){m.hideProgress(),m.settings.onerror(m.queue[0]),m.settings.onabort(m.queue[0]),m.queue=[],m.queueCount=0,m.queueSize=0,m.queueUploadedCount=0,m.queueUploadedSize=0,s(v,"error")}},this.uploaded=[],this.uri="/"+t.replace(/^\//,"").replace(/\/$/,"");for(var g in o)m.settings[g]=o[g];if(m.domPseudo&&m.domPseudo.value&&""!==m.domPseudo.value&&(m.uploaded=m.domPseudo.value.split(",")||[]),n=m.settings.debug===!0,m.domCountWrapper&&!m.settings.counter&&(m.domCountWrapper.style.display="none"),m.domCancelUpload&&!m.settings.abortable&&(m.domCancelUpload.style.display="none"),m.hideProgress(),null!==m.settings.dragdrop){var f=document.getElementById(m.settings.dragdrop);f&&(f.ondrop=function(e){e.preventDefault(),m.upload(e,e.target.files||e.dataTransfer.files),i(f,m.settings.hoverclass),i(f,m.settings.dropableclass)},f.ondragstart=function(){return r(f,m.settings.dropableclass),!1},f.ondragover=function(){return r(f,m.settings.hoverclass),!1},f.ondragleave=function(){return i(f,m.settings.hoverclass),!1},f.ondragend=function(){return i(f,m.settings.hoverclass),i(f,m.settings.dropableclass),!1})}var h=m.domInput?m.domInput.getAttribute("accept"):"";if(h){var q=h.replace(/ /g,"").split(",");if(q.length)for(var v in q)"."===q[v].substr(0,1)?m.acceptExtentions.push(q[v].substr(1).toLowerCase()):m.acceptTypes.push(q[v].replace(/\//g,"\\/").replace(/\*/g,".*")),m.acceptRaw.push(q[v])}if(!d)return m.hideProgress(),s("Your browser does not support AJAX uploading","warn",!0),null;if(!m.domInput)throw'No element exists with id="'+e+'"';return m.domPseudo&&(m.domPseudo.name=m.domInput.name.replace("[]",""),m.domInput.removeAttribute("name")),m.domInput.addEventListener("change",m.upload),!0};return function(t,o,n){return new e(t,o,n)}});
\ No newline at end of file
diff --git a/src/Core/Resources/twist/fileupload/js/twistfileupload.js b/src/Core/Resources/twist/fileupload/js/twistfileupload.js
index 6a784756..c9ef96c2 100755
--- a/src/Core/Resources/twist/fileupload/js/twistfileupload.js
+++ b/src/Core/Resources/twist/fileupload/js/twistfileupload.js
@@ -405,19 +405,23 @@
 
 						for( var intFileDetail in arrFileDetails ) {
 							var strFileDetail = arrFileDetails[intFileDetail],
-									strProperty = objUploadedFile[strFileDetail];
+									strProperty;
 
 							if( strFileDetail.indexOf( '/' ) !== -1 ) {
 								var arrDelve = strFileDetail.split( '/' ),
-										objToDelve = objUploadedFile[arrDelve[0]];
+										objToDelve = objUploadedFile[arrDelve[0]] || null;
 
 								arrDelve.shift();
 
-								for( var intKeyPart in arrDelve ) {
-									objToDelve = objToDelve[arrDelve[intKeyPart]];
-								}
+								if( objToDelve ) {
+									for( var intKeyPart in arrDelve ) {
+										objToDelve = objToDelve[arrDelve[intKeyPart]] || null;
+									}
 
-								strProperty = objToDelve;
+									strProperty = objToDelve || null;
+								}
+							} else {
+								strProperty = objUploadedFile[strFileDetail] || null;
 							}
 
 							strFileDetails += '<li data-key="' + strFileDetail + '"><span>' + strFileDetail.replace( /[\/_]/g, ' ' ) + ' :</span>' + strProperty + '</li>';