Fixed custom exceptions