Add some return value check