improved coverage and caught exceptions
improved coverage and caught exceptions