Add even more error reporting