Improve error handling
Minor tidyup to super calls