Error handling semplification. More tests