Fixed bug Exceptions causing erros