Minor update I should've taken care of...

Do de do.... Better exception handling ^_^