Return errors instead of null for clarity and consistency (#1424)

Null is sometimes an expected value.