Mathias Lorente - 2011-01-14

Patch to avoid segmentation fault.