more safeguard for null mass