fixed stupid exception stuff