modify exceptions, added methods for issue