Added basic error handling for now