Fix annotations, modify methods order
Throw exception instead of logging error