closes #2035

Added the check mentioned in issue #2035