Added some verifications.