Remove unnecessary requires method
Handle nulls