Exceptions handling solutions added