Disk space checks should come earlier and use MB in the message

Disk space checks should come earlier and use MB in the message #1730