Fixed crash issue & Logger Optimisation