Added error handling

--No way to crash it, so unable to test...