Fix clang errors, better error message