Added more struct.c null-checks