Feature/991 settings nullpointer

# Warning 
# Info 
# Issues
Fixes #991.