Exception removed
Little package changes