Fixed a few error reporting bugs introduced in the signal trapping changes