diff --git a/src/main/resources/static/js/datatransfer.js b/src/main/resources/static/js/datatransfer.js
index a693699..11fcc19 100644
--- a/src/main/resources/static/js/datatransfer.js
+++ b/src/main/resources/static/js/datatransfer.js
@@ -303,9 +303,9 @@ function fillMessageList(){
         innerHTML += generateMessageTileHtml(json[i].mockedResponseId, json[i].httpStatus, json[i].mediaType);
     }
     $("#listItems").append(innerHTML);
-    $('.tile').click(function(e) {
-        const id = parseInt(e.target.tileId)
-        loadMessage(id);
+    $('.tile').click(function() {
+        console.log(this);
+        loadMessage(parseInt($(this).attr('tileid')));
     });
     // $('.btn-tile').click(tileRemoval);
 }
@@ -332,10 +332,15 @@ function callLoadMessage(id){
 }
 
 function loadMessage(id){
+    if(id == null || id == undefined){
+        console.log('id is null');
+        return;
+    }
     lastId = id;
     setCookie();
     setDataOrigin();
     for(let i=0; i<json.length; i++){
+        console.log('id == ' + id + ' mockedId == ' + json[i].mockedResponseId);
         if(id == json[i].mockedResponseId){
             jsonIndex = i;
             console.log("Message found");
@@ -349,10 +354,6 @@ function loadMessage(id){
     console.log("Message not found");
 }
 
-// TODO: Add click() when generating tiles
-const tileOnclick = function (){
-
-}
 
 function selectMessage(id){
     const tiles = $('.tile');
diff --git a/target/classes/static/js/datatransfer.js b/target/classes/static/js/datatransfer.js
index a693699..0091390 100644
--- a/target/classes/static/js/datatransfer.js
+++ b/target/classes/static/js/datatransfer.js
@@ -303,9 +303,12 @@ function fillMessageList(){
         innerHTML += generateMessageTileHtml(json[i].mockedResponseId, json[i].httpStatus, json[i].mediaType);
     }
     $("#listItems").append(innerHTML);
-    $('.tile').click(function(e) {
-        const id = parseInt(e.target.tileId)
-        loadMessage(id);
+    $('.tile').click(function() {
+        console.log(this);
+        loadMessage(parseInt($(this).attr('tileid')));
+        // console.log(e.target);
+        // const id = parseInt(e.target.tileid);
+        // loadMessage(id);
     });
     // $('.btn-tile').click(tileRemoval);
 }
@@ -332,10 +335,15 @@ function callLoadMessage(id){
 }
 
 function loadMessage(id){
+    if(id == null || id == undefined){
+        console.log('id is null');
+        return;
+    }
     lastId = id;
     setCookie();
     setDataOrigin();
     for(let i=0; i<json.length; i++){
+        console.log('id == ' + id + ' mockedId == ' + json[i].mockedResponseId);
         if(id == json[i].mockedResponseId){
             jsonIndex = i;
             console.log("Message found");
@@ -349,10 +357,6 @@ function loadMessage(id){
     console.log("Message not found");
 }
 
-// TODO: Add click() when generating tiles
-const tileOnclick = function (){
-
-}
 
 function selectMessage(id){
     const tiles = $('.tile');