Replaced remaining exceptions (#27)