Fix: 'NoneType' object has no attribute 'rfind'.

Reason was: self.cover exists, put may be None.
Merge branch 'maintain/0.6.x' into develop