Fixed Exceptions

Signed-off-by: Baki Goxhaj <banago@gmail.com>