cms-sw/cmssw — pull request #5634 by degano (2014-10-01 14:01:53+00:00)
Title: Fix conflicting checks.

The if statement would never be true.
With this fix the functionality is preserved with some more information in case of error.