Fixes for Exceptions on connection.
Fixes for the codebase (It works now!)