Simplify method by not returning unused boolean
Simplify method implementation
Raise exception where error is detected