Removed old module, changed error handling