Throw exception case improved