Add lib specific exception, add test