Also fixes a few untreated exceptions and remove unused variables.

Signed-off-by: Giovanni Cimolin da Silva <giovannicimolin@gmail.com>