Fixed the excpetion handling