strengthening assertion checks