Check for container organic flag before checking weight (Fixes #1654)