Add nice error + improve dependencies