removed compiler warning
compiler warning removed
Add nullptr check
Work on configuration
configuration continued