Add some more exception handling... ewww..