Avoid null access
Fine tuning