small fix on exception, less dirty hack