fixed annoyance with exception handling, will have to be more robust in the future though