Added results grid and exception handling