Fixing minor bugs
Better error messages throwed
Better error messages throwed