Refinement of warnings to appropriate cases
Merge pull request #605 from dbetebenner/master

Refinement of warnings to appropriate cases