Fixed buttons inactivity. Upgraded errors handling