Fixed bug caused by checking settings.

Used Joel's fix for this. Need to check with
hasattr before checking value.
Updated