remove log
Handle nil & null parameters better in API