Fix after Psi upstream changes
Fix after Psi upstream changes in error type handling
Merge pull request #8 from FlorianFieber/upstream-fix

Fix patches for Psi #144