stupid stuff
error handling
fix