Fixes Exception raising