Minor UI fixed
Fixed 2 crash conditions