Added support for throws