modify thrown exception

#### Reviewers
@jframos @flopezag

#### Description
FIX modify thrown exception

#### Test
Tested locally