Fixed possible segmentation fault upon unset with watchpoints