Fix Prefs...
Better error handling