Removed Exception to own class