Fix Less Error-Handling