Added null checks for user settings