Makes sure that Cypher only throws valid exception
Merge pull request #1373 from systay/exceptions

Makes sure that Cypher only throws valid exception