Renamed aspect and changed exception message according to salfab's suggestion