Fixed changing prefix, post merging. Fixed one point in error handling.
Merge pull request #454 from l0ud/0.5.x

Fixed changing prefix, post merging. Fixed one point in error handling.