Added additional verification at construct time