Fixed one segfault. More to go