Deleted prints, added exception throw