BZ-9549: error checking and nice UI changes

Signed-off-by: Paden <padenportillo@gmail.com>