Added exception for undefined constant values and minor changes to resolver search