mattdrayer/api-null-points-check: Ensure aggregate operation result

@martynjames -- here's a first attempt at resolving the "invalid operator" exception you are seeing -- take a look and let me know what you think.