Add BaseException handling
Corrected some info