Fix: Add more log and missing error message