Fix to rescue exceptions on test