Added error handling
0.0.3