task 2.3 fix, no more exceptions