Bug Fix and Error page