Minor UI fixes, added catch to avoid possible crash.