Modified some error message
Added more debug message
A new bug came up