(Lakka) Prevent some more segfault bugs