Commented some lines that caused problems

I've commented out a couple of lines that were causing me some trouble.

I must say that I haven't analysed the code. I've just removed the lines that were throwing exceptions on me. I may have broken something