removed unnecessary excpetion