Removed some logging and fixed crash on exception