Very minor fixes

Added some  try/catches to problem areas. Exception handling has not
been implemented