Now avoiding to try to swap to null
Some modifications about memory leaks : Errors to correct