@tgtanya you have made the change at only place the generic exceptions are at two other places.
This is a duplicate of #1946 so closing as such :)
Pull-Request has been closed by pingou