Fixed comments
Replaced ValueError by BaseError