CW1 fixed

I did not have enough time for:
-create exception
-free memory
In home it takes a few minutes:(