Fixed the junk with the exception