Added assert_not_null