Remove jade warning
Better error handling