Use new initialiser syntax more often
Correct item on specific exception