Fixing crashes caused by new location event logging