FIX: update error message and improvements on GUI.