Seems ok. Can you completely remove that exception line and add what you just wrote as comment? So we don't get puzzled about this in 5 months :)