Added weight check