[IMP] Improve error logs