Add proper asserts

Add asserts to help users