Adding BC and some fixes.
Fixed wrong throws, closes #923.
Merge pull request #922 from cmfcmf/patch

Adding BC and some fixes.