kkuhn Removed one unessary final call that was throwing an error