Fixed loading and caught some exceptions