Fixed return404(), more implementation