See comments

Fixed logic of one method
Deleted extra error message