Fixed kill null errors