Add throwing of exceptions