Fix possible SEGFAULT conditions