Patch 5.0

Bug Fix and Extra error messages