Fixed issue: Use own Exception class