Improve exceptions in user-fixes/spazi