Removed commented exception handling