Better nil handling