Improve user errors detection