Adding exceptions

Signed-off-by: RJ garcia <rj@bighead.net>