removed redundant error handling