Renamed package
Proper exception handling