[FIX] Added some logging for debugging and try / catches