NOJIRA Fixed tests improved exception handling