Improve Exceptions (SMACK-426)