NOJIRA more robust error handling