Fix #1404 - Spinner

Spinner still visible if there's an error.
#1404