removing unthrown exceptions. relates to #171