Consistently return null error instead of undefined on success