refactor bug
better error handling
better error handling