Add #currentField
Add a little more error handling - so issues don't go bang