1.2.5
Fixes
Error handling
Better naming