excpetion fix