Update default return value to null instead of boolean